[Koha-bugs] [Bug 7264] Display information about library on OPAC detail

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

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

M. de Rooy <m.de.rooy at rijksmuseum.nl> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply
                 CC|                            |m.de.rooy at rijksmuseum.nl

--- Comment #15 from M. de Rooy <m.de.rooy at rijksmuseum.nl> 2012-02-27 08:06:34 UTC ---
Applying: bug_7264: [SIGNED-OFF] Added opac_info field to branches table.
/usr/share/koha/testclone/.git/rebase-apply/patch:201: trailing whitespace.
 *
/usr/share/koha/testclone/.git/rebase-apply/patch:203: trailing whitespace.
 *
/usr/share/koha/testclone/.git/rebase-apply/patch:205: trailing whitespace.
 *
/usr/share/koha/testclone/.git/rebase-apply/patch:207: trailing whitespace.
 *
error: patch failed: C4/Items.pm:1235
error: C4/Items.pm: patch does not apply
error: patch failed: installer/data/mysql/updatedatabase.pl:4663
error: installer/data/mysql/updatedatabase.pl: patch does not apply
warning: koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt has type 100644,
expected 100755
Using index info to reconstruct a base tree...
<stdin>:201: trailing whitespace.
 *
<stdin>:203: trailing whitespace.
 *
<stdin>:205: trailing whitespace.
 *
<stdin>:207: trailing whitespace.
 *
warning: 4 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merged C4/Items.pm
CONFLICT (content): Merge conflict in C4/Items.pm
Auto-merged installer/data/mysql/kohastructure.sql
Auto-merged installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merged koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Failed to merge in the changes.

Please rebase, fix whitespace warnings too and note file attribs. Thanks!

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.