[Koha-bugs] [Bug 18931] Add a "data corrupted" section on the about page

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Fri Jul 21 09:48:34 CEST 2017


https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18931

Hugo Agud <hagud at orex.es> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |hagud at orex.es
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #5 from Hugo Agud <hagud at orex.es> ---
Good morning

I tried to apply this patch but get this error


CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 18931: Add a "data corrupted" section on the about
page - MySQL AI
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/patch
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/1605x-Bug-18931-Add-a-data-corrupted-section-on-th-WHdTUz.patch

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


More information about the Koha-bugs mailing list