search

kolgepratik / js.tableutils

A jQuery plugin for HTML Tables. You can - Fix Table Headers with both Vertical and Horizontal Scrolling support, Add master CheckBox, Enable Sorting, Filtering, Client-side and Server-side Numeric, Alphabetic and Alphanumeric Pagination, Addition of new rows to the table, Deletion of exiting rows, Editing of existing rows.
13 stars 7 forks source link

Demo.html has unresolved merge conflicts #7

Closed DavidTaylorEmberex closed 10 years ago

DavidTaylorEmberex commented 10 years ago

I'm sure you've noticed, (or will shortly) but you have two merge conflicts needing resolution committed into Demo.html (lines 181 and 653). The demo might work a little better with those fixed. :)

kolgepratik commented 10 years ago

Thanks for pointing that out David, Fixed it. Demo is working fine now :)