]> git.koha-community.org Git - koha.git/commit
Bug 26602:[20.05.x] Remove stray merge marker
authorAndrew Fuerste-Henry <andrew@bywatersolutions.com>
Tue, 23 Feb 2021 19:20:02 +0000 (19:20 +0000)
committerAndrew Fuerste-Henry <andrew@bywatersolutions.com>
Tue, 23 Feb 2021 19:20:02 +0000 (19:20 +0000)
commitf51f0edd40a7bc6bb10c5c6440a8a1fa9583f9c0
tree3ea909500f568fa9b8007ce98d8e6838d272ce45
parent41cb970fee06f5c8992f277c027ffde03951f54f
Bug 26602:[20.05.x] Remove stray merge marker

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt