[Koha-bugs] [Bug 7083] Show creator name on list of public lists

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Does not apply              |Signed Off

--- Comment #4 from M. de Rooy <m.de.rooy at rijksmuseum.nl> 2011-12-07 13:56:00 UTC ---
(In reply to comment #3)
> Applying: Fix for Bug 7083 - [SIGNED-OFF] Show creator name on list of public
> lists
> error: koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt: does
> not match index
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> error: Entry
> 'koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt' not
> uptodate. Cannot merge.
> fatal: merging of trees bf768d4642523bde5041af12d0403bec35148bb2 and
> 07a8614703fa983c030071c562ba07d3467f8448 failed
> Failed to merge in the changes.
> 
> Please send a rebased patch. Will continue QA after it has arrived.

Sorry, this seems to be my problem. Looking further now..

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