# HG changeset patch
# User Patrick Hurst <phurst@mit.edu>
# Date 1386280146 18000
# Node ID 146d77161cb9ad6026a843e9f2fe7c7bc731b03e
# Parent  2a3ccd61b11bc0398819acf173fc55eeedf45523
Fix bootstrap/bootstrap3 conflicts.

diff -r 2a3ccd61b11b -r 146d77161cb9 bootstrap3.ur
--- a/bootstrap3.ur	Thu Oct 31 07:45:23 2013 -0400
+++ b/bootstrap3.ur	Thu Dec 05 16:49:06 2013 -0500
@@ -194,6 +194,7 @@
 style collapsing
 style container
 style css
+style disabled
 style dl_horizontal
 style dropdown
 style dropdown_backdrop
diff -r 2a3ccd61b11b -r 146d77161cb9 lib.urp
--- a/lib.urp	Thu Oct 31 07:45:23 2013 -0400
+++ b/lib.urp	Thu Dec 05 16:49:06 2013 -0500
@@ -1,6 +1,4 @@
 rewrite style Bootstrap/table_ table
-rewrite style Bootstrap/* [-]
-rewrite style Bootstrap3/* [-]
 
 bootstrap
 bootstrap3
\ No newline at end of file