[Koha-bugs] [Bug 10330] Rename system preference authoritysep to AuthoritySeperator

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

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

David Cook <dcook at prosentient.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |dcook at prosentient.com.au

--- Comment #2 from David Cook <dcook at prosentient.com.au> ---
Maybe there's something wrong with my files, but I think you need a rebase.

Applying: Bug 10330 - Rename system preference authoritysep to
AuthoritySeperator
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 10330 - Rename system preference authoritysep to
AuthoritySeperator

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