dsplink: remove damage done by git * what tool stores inline conflicts in files in this day and age!?
dsplink: remove damage done by git
* what tool stores inline conflicts in files in this day and age!?

troth/oe-ts7xxx,trini/openembedded,anguslees/openembedded-android,sledz/oe,nlebedenco/mini2440,crystalfontz/openembedded,rascalmicro/openembedded-rascal,nzjrs/overo-openembedded,nzjrs/overo-openembedded,JrCs/opendreambox,sledz/oe,sutajiokousagi/openembedded,sutajiokousagi/openembedded,anguslees/openembedded-android,John-NY/overo-oe,trini/openembedded,popazerty/openembedded-cuberevo,philb/pbcl-oe-2010,YtvwlD/od-oe,troth/oe-ts7xxx,thebohemian/openembedded,mrchapp/arago-oe-dev,xifengchuo/openembedded,scottellis/overo-oe,JrCs/opendreambox,yyli/overo-oe,openpli-arm/openembedded,JrCs/opendreambox,sampov2/audio-openembedded,dave-billin/overo-ui-moos-auv,nlebedenco/mini2440,BlackPole/bp-openembedded,YtvwlD/od-oe,yyli/overo-oe,JrCs/opendreambox,anguslees/openembedded-android,JrCs/opendreambox,openpli-arm/openembedded,BlackPole/bp-openembedded,openembedded/openembedded,libo/openembedded,dellysunnymtech/sakoman-oe,mrchapp/arago-oe-dev,JamesAng/oe,nzjrs/overo-openembedded,anguslees/openembedded-android,YtvwlD/od-oe,thebohemian/openembedded,JamesAng/goe,nx111/openembeded_openpli2.1_nx111,BlackPole/bp-openembedded,nx111/openembeded_openpli2.1_nx111,giobauermeister/openembedded,troth/oe-ts7xxx,yyli/overo-oe,buglabs/oe-buglabs,KDAB/OpenEmbedded-Archos,bticino/openembedded,KDAB/OpenEmbedded-Archos,popazerty/openembedded-cuberevo,libo/openembedded,sentient-energy/emsw-oe-mirror,demsey/openembedded,openembedded/openembedded,Martix/Eonos,SIFTeam/openembedded,xifengchuo/openembedded,xifengchuo/openembedded,scottellis/overo-oe,SIFTeam/openembedded,buglabs/oe-buglabs,sentient-energy/emsw-oe-mirror,KDAB/OpenEmbedded-Archos,giobauermeister/openembedded,buglabs/oe-buglabs,sentient-energy/emsw-oe-mirror,dave-billin/overo-ui-moos-auv,rascalmicro/openembedded-rascal,dave-billin/overo-ui-moos-auv,hulifox008/openembedded,BlackPole/bp-openembedded,nx111/openembeded_openpli2.1_nx111,philb/pbcl-oe-2010,philb/pbcl-oe-2010,JrCs/opendreambox,demsey/openembedded,nlebedenco/mini2440,troth/oe-ts7xxx,dellysunnymtech/sakoman-oe,trini/openembedded,scottellis/overo-oe,libo/openembedded,giobauermeister/openembedded,xifengchuo/openembedded,dave-billin/overo-ui-moos-auv,dellysunnymtech/sakoman-oe,dellysunnymtech/sakoman-oe,BlackPole/bp-openembedded,John-NY/overo-oe,Martix/Eonos,giobauermeister/openembedded,nlebedenco/mini2440,philb/pbcl-oe-2010,Martix/Eonos,mrchapp/arago-oe-dev,rascalmicro/openembedded-rascal,nvl1109/openembeded,libo/openembedded,sampov2/audio-openembedded,John-NY/overo-oe,dave-billin/overo-ui-moos-auv,sampov2/audio-openembedded,bticino/openembedded,mrchapp/arago-oe-dev,xifengchuo/openembedded,YtvwlD/od-oe,openpli-arm/openembedded,hulifox008/openembedded,trini/openembedded,nx111/openembeded_openpli2.1_nx111,hulifox008/openembedded,nzjrs/overo-openembedded,demsey/openenigma2,demsey/openenigma2,bticino/openembedded,yyli/overo-oe,yyli/overo-oe,demsey/openembedded,demsey/openembedded,nx111/openembeded_openpli2.1_nx111,JamesAng/oe,YtvwlD/od-oe,popazerty/openembedded-cuberevo,openembedded/openembedded,demsey/openenigma2,demsey/openenigma2,openpli-arm/openembedded,nvl1109/openembeded,dellysunnymtech/sakoman-oe,crystalfontz/openembedded,YtvwlD/od-oe,openembedded/openembedded,buglabs/oe-buglabs,JamesAng/goe,thebohemian/openembedded,openpli-arm/openembedded,JamesAng/oe,sentient-energy/emsw-oe-mirror,rascalmicro/openembedded-rascal,openembedded/openembedded,rascalmicro/openembedded-rascal,nvl1109/openembeded,JamesAng/oe,bticino/openembedded,demsey/openenigma2,nvl1109/openembeded,crystalfontz/openembedded,YtvwlD/od-oe,KDAB/OpenEmbedded-Archos,crystalfontz/openembedded,bticino/openembedded,mrchapp/arago-oe-dev,sledz/oe,philb/pbcl-oe-2010,openembedded/openembedded,sutajiokousagi/openembedded,philb/pbcl-oe-2010,nx111/openembeded_openpli2.1_nx111,nzjrs/overo-openembedded,buglabs/oe-buglabs,SIFTeam/openembedded,KDAB/OpenEmbedded-Archos,openembedded/openembedded,SIFTeam/openembedded,JamesAng/goe,nx111/openembeded_openpli2.1_nx111,troth/oe-ts7xxx,popazerty/openembedded-cuberevo,giobauermeister/openembedded,scottellis/overo-oe,popazerty/openembedded-cuberevo,sentient-energy/emsw-oe-mirror,xifengchuo/openembedded,anguslees/openembedded-android,giobauermeister/openembedded,SIFTeam/openembedded,Martix/Eonos,rascalmicro/openembedded-rascal,nzjrs/overo-openembedded,sledz/oe,troth/oe-ts7xxx,mrchapp/arago-oe-dev,nvl1109/openembeded,yyli/overo-oe,libo/openembedded,sutajiokousagi/openembedded,BlackPole/bp-openembedded,hulifox008/openembedded,troth/oe-ts7xxx,nzjrs/overo-openembedded,openembedded/openembedded,nx111/openembeded_openpli2.1_nx111,KDAB/OpenEmbedded-Archos,popazerty/openembedded-cuberevo,JrCs/opendreambox,xifengchuo/openembedded,buglabs/oe-buglabs,thebohemian/openembedded,YtvwlD/od-oe,sampov2/audio-openembedded,giobauermeister/openembedded,thebohemian/openembedded,libo/openembedded,rascalmicro/openembedded-rascal,demsey/openembedded,dellysunnymtech/sakoman-oe,dave-billin/overo-ui-moos-auv,dave-billin/overo-ui-moos-auv,crystalfontz/openembedded,demsey/openembedded,rascalmicro/openembedded-rascal,philb/pbcl-oe-2010,openpli-arm/openembedded,JrCs/opendreambox,sentient-energy/emsw-oe-mirror,xifengchuo/openembedded,John-NY/overo-oe,openpli-arm/openembedded,sledz/oe,thebohemian/openembedded,libo/openembedded,sentient-energy/emsw-oe-mirror,hulifox008/openembedded,anguslees/openembedded-android,giobauermeister/openembedded,giobauermeister/openembedded,openembedded/openembedded,buglabs/oe-buglabs,trini/openembedded,yyli/overo-oe,nvl1109/openembeded,sampov2/audio-openembedded,dellysunnymtech/sakoman-oe,sutajiokousagi/openembedded,demsey/openembedded,SIFTeam/openembedded,BlackPole/bp-openembedded,SIFTeam/openembedded,JamesAng/goe,nlebedenco/mini2440,anguslees/openembedded-android,popazerty/openembedded-cuberevo,openembedded/openembedded,openembedded/openembedded,demsey/openenigma2,JamesAng/goe,nlebedenco/mini2440,sledz/oe,John-NY/overo-oe,dellysunnymtech/sakoman-oe,trini/openembedded,Martix/Eonos,hulifox008/openembedded,scottellis/overo-oe,crystalfontz/openembedded,bticino/openembedded,KDAB/OpenEmbedded-Archos,bticino/openembedded,demsey/openenigma2,JamesAng/oe,sampov2/audio-openembedded,sutajiokousagi/openembedded,sampov2/audio-openembedded,JamesAng/oe,JrCs/opendreambox,JamesAng/goe,thebohemian/openembedded,scottellis/overo-oe,sledz/oe,John-NY/overo-oe,sutajiokousagi/openembedded,yyli/overo-oe,JamesAng/goe,hulifox008/openembedded,popazerty/openembedded-cuberevo,Martix/Eonos,nlebedenco/mini2440,trini/openembedded,buglabs/oe-buglabs,Martix/Eonos,mrchapp/arago-oe-dev,dellysunnymtech/sakoman-oe,John-NY/overo-oe,xifengchuo/openembedded,JamesAng/oe,crystalfontz/openembedded,nvl1109/openembeded,scottellis/overo-oe