changeset 4:146d77161cb9
Fix bootstrap/bootstrap3 conflicts.
| author |
Patrick Hurst <phurst@mit.edu> |
| date |
Thu, 05 Dec 2013 16:49:06 -0500 |
| parents |
2a3ccd61b11b |
| children |
b94c7597452f |
| files |
bootstrap3.ur lib.urp |
| diffstat |
2 files changed, 1 insertions(+), 2 deletions(-)
[+]
|
line diff
--- 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
--- 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
