https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20472

--- Comment #22 from Marcel de Rooy <[email protected]> ---
CONFLICT (modify/delete):
installer/data/mysql/uk-UA/mandatory/sample_notices.sql deleted in HEAD and
modified in Bug 20472: Update translated AR notices. Version Bug 20472: Update
translated AR notices of
installer/data/mysql/uk-UA/mandatory/sample_notices.sql left in tree.
CONFLICT (modify/delete):
installer/data/mysql/ru-RU/mandatory/sample_notices.sql deleted in HEAD and
modified in Bug 20472: Update translated AR notices. Version Bug 20472: Update
translated AR notices of
installer/data/mysql/ru-RU/mandatory/sample_notices.sql left in tree.
CONFLICT (modify/delete):
installer/data/mysql/pl-PL/mandatory/sample_notices.sql deleted in HEAD and
modified in Bug 20472: Update translated AR notices. Version Bug 20472: Update
translated AR notices of
installer/data/mysql/pl-PL/mandatory/sample_notices.sql left in tree.

I will leave these out now.

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[email protected]
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to