From 4fb9e84c94cb2870a47ae2f9d6f66ea33b124758 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 25 Jan 2005 07:25:10 +0000 Subject: [PATCH] removed merge conflicts git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7558 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/mars/ChangeLog | 9 --------- 1 file changed, 9 deletions(-) diff --git a/camlibs/mars/ChangeLog b/camlibs/mars/ChangeLog index 6b683163a..2b91a124e 100644 --- a/camlibs/mars/ChangeLog +++ b/camlibs/mars/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< ChangeLog 2005-01-24 Theodore Kilgore * library.c: Added Precision Mini Model HA513A, reported by Alexander Bostrom. @@ -11,14 +10,6 @@ 2005-01-14 Theodore Kilgore -======= -2005-01-17 Theodore Kilgore - - * library.c: Argus DC-1610/20 do not currently work; commented out. - - -2005-01-14 Theodore Kilgore ->>>>>>> 1.8 * library.c: Added Argus DC-1610 and DC-1620.