projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ba8ec9b) | patch
Bug 15766: (follow-up) Correct merge errors
authorOwen Leonard <oleonard@myacpl.org>
Thu, 31 May 2018 16:54:43 +0000 (16:54 +0000)
committerNick Clemens <nick@bywatersolutions.com>
Wed, 24 Oct 2018 13:52:42 +0000 (13:52 +0000)
commitf4b7e470e774c43d9b9771f103cefc53d5ecc71f
tree15dae880561bb8e20692bbe43629c62972a78d43tree | snapshot
parentba8ec9bfe2c538f4b586f30426e2dffb10b814aecommit | diff
Bug 15766: (follow-up) Correct merge errors

This patch corrects some problems applying this on current master and
removes an old merge conflict marker.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt diff | blob | history
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git