[Koha-bugs] [Bug 18922] Mana - Share review

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

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

Hugo Agud <hagud at orex.es> changed:

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

--- Comment #4 from Hugo Agud <hagud at orex.es> ---
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Failed to merge in the changes.
Patch failed at 0001 Bug 19474: (follow-up) Compiled CSS
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/Bug-19474-follow-up-Compiled-CSS-hIYP0p.patch

Cannot apply cleanly patches from bug 19474. Everything will be left dirty.
git bz apply --continue will not continue the process if patches from other bug
reports need to be applied.

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