From 68efdfc1da38a96ff67cb7d8fee07edce2dc898e Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Fri, 30 Dec 2005 00:33:18 +0000
Subject: [PATCH] remove CVS conflict that has been committed

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8370 67ed7778-7388-44ab-90cf-0a291f65f57c
---
 camlibs/digigr8/library.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/camlibs/digigr8/library.c b/camlibs/digigr8/library.c
index efebe5964..e20b1920c 100644
--- a/camlibs/digigr8/library.c
+++ b/camlibs/digigr8/library.c
@@ -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}
 };