[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
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #37 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Sorry, lots of conflicts:

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/kohastructure.sql
M    installer/data/mysql/updatedatabase.pl
M    koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
M    koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
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/modules/admin/admin-home.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

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