Merge branch 'update'

* update: Update from upstream bootstrap
stevelaz · Apr 30, 2014 · d0ce626 · d0ce626
2 parents d06d0c3 + cd20ca9
commit d0ce626
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/less/panels.less b/less/panels.less
@@ -186,8 +186,6 @@
   }
 }
 
-
-<<<<<<< HEAD
 // Optional heading
 .panel-heading {
   padding: @panel-heading-padding;
@@ -219,9 +217,6 @@
   .border-bottom-radius((@panel-border-radius - 1));
 }
 
-
-=======
->>>>>>> upstream/master
 // Collapsable panels (aka, accordion)
 //
 // Wrap a series of panels in `.panel-group` to turn them into an accordion with

diff --git a/less/variables.less b/less/variables.less
@@ -829,8 +829,6 @@
 
 //** Horizontal offset for forms and lists.
 @component-offset-horizontal: 180px;
-<<<<<<< HEAD
-
 
 //== Container sizes
 //
@@ -857,5 +855,3 @@
 @panel-heading-padding:        10px;
 @panel-body-padding:           10px;
 @panel-footer-padding:         10px;
-=======
->>>>>>> upstream/master