[Koha-bugs] [Bug 7303] Not being able to create funds with the same name

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

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

jmbroust <jean-manuel.broust at univ-lyon2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA
                 CC|                            |jean-manuel.broust at univ-lyo
                   |                            |n2.fr

--- Comment #5 from jmbroust <jean-manuel.broust at univ-lyon2.fr> ---
<h1>Something went wrong !</h1>Applying: Bug 7303: Adds unicity for budget and
fund<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/>
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt<br/>
Failed to merge in the changes.<br/>

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