[Koha-bugs] [Bug 13642] Adding new features for Dublin Core metadata

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13642

--- Comment #68 from Marc Véron <veron at veron.ch> ---
Sorry, I got conflicts while applying:

Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Auto-merging debian/control
CONFLICT (content): Merge conflict in debian/control
Auto-merging C4/Installer/PerlDependencies.pm
CONFLICT (content): Merge conflict in C4/Installer/PerlDependencies.pm
Failed to merge in the changes.

-- 
You are receiving this mail because:
You are watching all bug changes.