Skip to contentSkip to conversation

isdn: Remove left over conflict marker in Docmentation/isdn/00-INDEX

PATCH In review Eric W. Biederman 2 participants 2 messages Jun 19, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 isdn: Remove left over conflict marker in Docmentation/isdn/00-INDEX

In merge:
commit aba7453037c3a90714caae77a622dceaf1173786
Merge: a4fe91e... 93af7ac...
Author: David S. Miller <[email protected]>
Date: Wed Apr 29 20:30:35 2009 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
Documentation/isdn/00-INDEX drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/rndis_wlan.c net/mac80211/main.c

The following useless line was retained.

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX

Delete it and leave 00-INDEX looking reasonable.

---
 Documentation/isdn/00-INDEX |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Documentation/isdn/00-INDEX +0 -1
index f6010a5..e6ff335 100644
@@ -22,7 +22,6 @@ README.gigaset
 	- info on the drivers for Siemens Gigaset ISDN adapters.
 README.icn
 	- info on the ICN-ISDN-card and its driver.
->>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
 README.HiSax
 	- info on the HiSax driver which replaces the old teles.
 README.audio
Signature · 1 line
1.6.0.6