fixed merge results

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@905 b68d4a1b-bc3d-0410-92ed-d4ac073336b7

jtag/ChangeLog

@@ -1,5 +1,6 @@
 2007-12-30  Arnim Laeuger  <arniml@users.sourceforge.net>
 
+    * data/Makefile.am (nobase_dist_pkgdata_DATA): fixed merge results
     * many files: integration of BSDL parser
     * data/xilinx/PARTS: added xc2v80-fg256,xc2v250-fg256,xc2v1000-fg256
       '[ 1859678 ] jtag support for xilinx xc2v80-fg256, xc2v250, xc2v1000 FPGA' (Alexander Didebulidze)

jtag/data/Makefile.am

@@ -59,7 +59,6 @@ nobase_dist_pkgdata_DATA = \
 	analog/bf533/bf533 \
 	analog/PARTS \
 	analog/sharc21065l/STEPPINGS \
-	analog/sharc21065l/sharc21065l
 	analog/sharc21065l/sharc21065l \
 	brecis/PARTS \
 	brecis/msp2006/STEPPINGS \