[Koha-cvs] CVS: koha/C4 Biblio.pm,1.75,1.76

[MJ Ray]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv16788

Modified Files:
        Biblio.pm 
Log Message:
conflict markers?

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** Biblio.pm   3 Dec 2003 01:42:03 -0000       1.75
--- Biblio.pm   3 Dec 2003 01:43:41 -0000       1.76
***************
*** 2189,2192 ****
--- 2189,2195 ----
  # $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
***************
*** 3125,3129 ****
  
  =cut
- 
- =======
- >>>>>>> 1.74
--- 3128,3129 ----