From: slef <slef>
Date: Wed, 3 Dec 2003 01:43:41 +0000 (+0000)
Subject: conflict markers?
X-Git-Tag: R_2-0-0RC1~19
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=49b6f7872fbb57188537733f032df55da508db34;p=koha_gimpoz

conflict markers?
---

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 1ff2b99480..43adae4bee 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -2188,6 +2188,9 @@ Paul POULAIN paul.poulain@free.fr
 
 # $Id$
 # $Log$
+# Revision 1.76  2003/12/03 01:43:41  slef
+# conflict markers?
+#
 # Revision 1.75  2003/12/03 01:42:03  slef
 # bug 662 fixes securing DBI
 #
@@ -3124,6 +3127,3 @@ Koha Developement team <info@koha.org>
 Paul POULAIN paul.poulain@free.fr
 
 =cut
-
-=======
->>>>>>> 1.74