# HG changeset patch
# User David Snider <david@davidsnider.net>
# Date 1401064558 14400
#      Sun May 25 20:35:58 2014 -0400
# Node ID c8377b6f52dc1f8e7976850f3cbaf9e25b03ac0b
# Parent  c8b90464c6722d287a572f066cba2b28f8159587
Resolving more tag conflicts

diff --git a/bootstrap3.ur b/bootstrap3.ur
--- a/bootstrap3.ur
+++ b/bootstrap3.ur
@@ -188,16 +188,17 @@ style col_xs_4
 style col_xs_5
 style col_xs_6
 style col_xs_7
 style col_xs_8
 style col_xs_9
 style collapse
 style collapsing
 style container
+style control_label
 style css
 style disabled
 style dl_horizontal
 style dropdown
 style dropdown_backdrop
 style dropdown_header
 style dropdown_menu
 style dropdown_toggle
@@ -437,17 +438,17 @@ style input_group_addon
 style input_group_btn
 style input_group_lg
 style input_group_sm
 style input_lg
 style input_sm
 style invisible
 style ir
 style jumbotron
-style label
+style label_
 style label_danger
 style label_default
 style label_info
 style label_primary
 style label_success
 style label_warning
 style lead
 style list_group
@@ -522,17 +523,17 @@ style progress_bar_info
 style progress_bar_success
 style progress_bar_warning
 style progress_striped
 style pull_left
 style pull_right
 style radio
 style radio_inline
 style row
-style show
+style show_
 style sr_only
 style tab_content
 style tabbable
 style table_bordered
 style table_condensed
 style table_hover
 style table_responsive
 style table_striped
diff --git a/lib.urp b/lib.urp
--- a/lib.urp
+++ b/lib.urp
@@ -1,11 +1,13 @@
 rewrite style Bootstrap/table_ table
 rewrite style Boostrap/h1_ h1
 rewrite style Boostrap/h2_ h2
 rewrite style Boostrap/h3_ h3
 rewrite style Boostrap/h4_ h4
 rewrite style Boostrap/h5_ h5
 rewrite style Boostrap/h6_ h6
 rewrite style Bootstrap/nav_ nav
+rewrite style Bootstrap/label_ label
+rewrite style Bootstrap/show_ show
 
 bootstrap
 bootstrap3
