diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-11-19 16:25:39 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-11-19 16:25:39 +0100 |
| commit | a021f55580c68f6bf88393111ece7f14007b7b09 (patch) | |
| tree | c5fb09bb2e71e0b52eb967b2c5a85f1b2113949d /site/sh-common | |
| parent | c2b3a79ce8c90cb51cc4b1be3bfd7facd5970e77 (diff) | |
dsplink: remove damage done by git
* what tool stores inline conflicts in files in this day and age!?
Diffstat (limited to 'site/sh-common')
0 files changed, 0 insertions, 0 deletions