dsplink: remove damage done by git
authorKoen Kooi <koen@openembedded.org>
Wed, 19 Nov 2008 15:25:39 +0000 (16:25 +0100)
committerKoen Kooi <koen@openembedded.org>
Wed, 19 Nov 2008 15:25:39 +0000 (16:25 +0100)
commita021f55580c68f6bf88393111ece7f14007b7b09
treec5fb09bb2e71e0b52eb967b2c5a85f1b2113949d
parentc2b3a79ce8c90cb51cc4b1be3bfd7facd5970e77
dsplink: remove damage done by git
* what tool stores inline conflicts in files in this day and age!?
packages/dsplink/dsplink.inc