darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove CVS conflict that has been committed

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8370 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Hubert Figuiere
2005-12-30 00:33:18 +00:00
parent abf108e81f
commit 68efdfc1da
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
camlibs/digigr8/library.c
View File

@@ -56,19 +56,10 @@ struct {
unsigned short idVendor;
unsigned short idProduct;
} models[] = {
<<<<<<< library.c
{"Digigr8", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
{"Che-Ez Snap SNAP-U", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
{"DC-N130t", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905C},
{"Soundstar TDC-35", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
=======
{"Digigr8", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c},
{"Che-Ez Snap SNAP-U", GP_DRIVER_STATUS_EXPERIMENTAL,
0x2770, 0x905c},
{"Soundstar TDC-35", GP_DRIVER_STATUS_EXPERIMENTAL,
0x2770, 0x905c},
>>>>>>> 1.2
{NULL,0,0,0}
};