http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9978
Jonathan Druart <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|[email protected] |[email protected] | |m --- Comment #7 from Jonathan Druart <[email protected]> --- (In reply to Katrin Fischer from comment #5) > Hm, some of the files have since been removed - what's the best way to fix > those conflicts? It was just 3 deleted files. so git rm files. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
