gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict markers?

This commit is contained in:
slef 2003-12-03 01:43:41 +00:00
parent 7b5ebdd51b
commit 49b6f7872f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C4/Biblio.pm
View File

@ -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