[Koha-bugs] [Bug 11876] Add a diff view to staged MARC Records.

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

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

Nick Clemens <nick at quecheelibrary.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |nick at quecheelibrary.org

--- Comment #9 from Nick Clemens <nick at quecheelibrary.org> ---
Bug 11876 - Add a diff view to staged MARC Records.

30797 - [SIGNED-OFF] Bug 11876 - Add a diff view for staged MARC records.
30798 - [SIGNED-OFF] Bug 11876 - Ommited files in last patch
30799 - [SIGNED-OFF] Bug 11876 - Diff column is now displayed.
30800 - Bug 11876 [Follow-up] Add a diff view to staged MARC Records

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11876 - Add a diff view for staged MARC records.
Applying: Bug 11876 - Ommited files in last patch
Applying: Bug 11876 - Diff column is now displayed.
Applying: Bug 11876 [Follow-up] Add a diff view to staged MARC Records
Using index info to reconstruct a base tree...
<stdin>:289: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Removing koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
Removing catalogue/showdiffmarc.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 11876 [Follow-up] Add a diff view to staged MARC
Records
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-11876-Follow-up-Add-a-diff-view-to-staged-MARC-iDw65M.patch

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