[Koha-bugs] [Bug 10212] Columns configuration for tables

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #52 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I am sorry Jonathan, with the changes to circ this will no longer apply :( 
Maybe another table could be used for the POC to avoid more conflicts while we
are tying to work through this?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 10212: Columns configuration for tables - Add Colvis files
Applying: Bug 10212: Columns configuration for tables
Using index info to reconstruct a base tree...
M    circ/circulation.pl
M    installer/data/mysql/updatedatabase.pl
M    koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
M    koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
<stdin>:223: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging circ/circulation.pl
CONFLICT (content): Merge conflict in circ/circulation.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 10212: Columns configuration for tables
The copy of the patch that failed is found in:
   /home/katrin/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-10212-Columns-configuration-for-tables-o21Nap.patch

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