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

Hugo Agud <ha...@orex.es> changed:

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

--- Comment #43 from Hugo Agud <ha...@orex.es> ---
<h1>Something went wrong !</h1>Applying: Bug 16243: Add reference manager
software (Mendeley and EasyBib) to OPAC
.git/rebase-apply/patch:60: trailing whitespace.
              choices:
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
M       koha-tmpl/opac-tmpl/bootstrap/less/opac.less
M       opac/opac-downloadcart.pl
.git/rebase-apply/patch:60: trailing whitespace.
              choices:
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-downloadcart.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/less/opac.less
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/less/opac.less
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging installer/data/mysql/sysprefs.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 16243: Add reference manager software (Mendeley and
EasyBib) to OPAC
The copy of the patch that failed is found in: .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.
Bug 16243 - Add reference manager software (Mendeley and EasyBib) to OPAC

55701 - Bug 16243: Add reference manager software (Mendeley and EasyBib) to
OPAC
55703 - Bug 16243: (follow-up) fix utf8 problems
55719 - Bug 16243: (follow-up) Fix QA comments
56727 - Bug 16243: Changes LESS opac.less > to opac.css

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-16243-Add-reference-manager-software-Mendeley--kZMAox.patch .

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to