From 49b6f7872fbb57188537733f032df55da508db34 Mon Sep 17 00:00:00 2001 From: slef Date: Wed, 3 Dec 2003 01:43:41 +0000 Subject: [PATCH] conflict markers? --- C4/Biblio.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 Paul POULAIN paul.poulain@free.fr =cut - -======= ->>>>>>> 1.74 -- 2.39.5