projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 711c649) | patch
C4/ILSDI/Services.pm Fixing rebasing and merge problems
authorHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Mon, 1 Mar 2010 08:47:55 +0000 (09:47 +0100)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 17 Mar 2010 00:39:50 +0000 (20:39 -0400)
commit825a6abf3e85ca06dca945702ca5ce371ec2007b
treece92cd3b8d8d820d0cfc89de3e004d855df4b39atree | snapshot
parent711c64931502ff978631bfdfa8531f778837d17ccommit | diff
C4/ILSDI/Services.pm Fixing rebasing and merge problems

Previous patches introduced many merge conflicts.
This patch fixes them all

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
C4/ILSDI/Services.pm diff | blob | history
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git