http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7294
jmbroust <jean-manuel.bro...@univ-lyon2.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Failed QA
CC| |jean-manuel.broust@univ-lyo
| |n2.fr
--- Comment #9 from jmbroust <jean-manuel.bro...@univ-lyon2.fr> ---
<h1>Something went wrong !</h1>Applying: Bug 7294: Adds acquisition
informations in marc record<br/>
Using index info to reconstruct a base tree...<br/>
Falling back to patching base and 3-way merge...<br/>
Auto-merging installer/data/mysql/kohastructure.sql<br/>
Auto-merging installer/data/mysql/updatedatabase.pl<br/>
CONFLICT (content): Merge conflict in
installer/data/mysql/updatedatabase.pl<br/>
Failed to merge in the changes.<br/>
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/
