]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6709813) | patch
Bug 14884: remove spurious conflict markers
authorRobin Sheat <robin@catalyst.net.nz>
Thu, 24 Sep 2015 02:20:33 +0000 (14:20 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 23 Oct 2015 07:34:56 +0000 (20:34 +1300)
commit231657a7cf4ad315a9aff84f4836c305f4cd3055
tree6808bbbbf88f4e516c2066db71ee7eef34d75605tree | snapshot
parent6709813a022de5e2cc53730e0299259ed9dc53bdcommit | diff
Bug 14884: remove spurious conflict markers

To test:
* Run t/00-merge-conflict-markers.t, ensure it passes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
t/db_dependent/Circulation.t diff | blob | history
Main Koha release repository