]> git.koha-community.org Git - koha.git/commit
Remove a merge marker.
authorMarc Balmer <marc@msys.ch>
Fri, 9 Mar 2012 13:39:49 +0000 (14:39 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 9 Mar 2012 13:51:57 +0000 (14:51 +0100)
commit6846bdb51953d236d5baf341ce3624887ea7ee53
tree5bd82a27f32421e6b4a185e5a76b3518379c9aa2
parentd56a693d844a1e64fc47b1f4b5ac82e0283f6493
Remove a merge marker.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
installer/data/mysql/sysprefs.sql