resolve conflict

8 files changed, 33 insertions, 32 deletions

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index ddf5582d5..6fceabd24 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,7 +1,7 @@
 /*
-  Master Stylesheet
-  This file is only for importing all required stylesheets for LESS to include and then compile.
-*/
+ * Master Stylesheet
+ * This file is only for importing all required stylesheets for LESS to include and then compile.
+ */
 
 // CSS Reset
 @import "reset.less";
diff --git a/lib/forms.less b/lib/forms.less
index 5a705b9fb..876f62123 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -1,7 +1,7 @@
 /*
-  Forms
-  Baseline styles for various input types, form layouts, and states
-*/
+ * Forms.less
+ * Base line styles for various input types, form layouts, and states
+ */
 
 
 /* Global form styles
@@ -79,14 +79,14 @@ form {
     .box-shadow(inset 0 1px 2px rgba(0,0,0,.075));
   }
   // Focus states
-  input[type=text], 
-  input[type=password], 
+  input[type=text],
+  input[type=password],
   select, textarea {
     @transition: border linear .2s, box-shadow linear .2s;
     .transition(@transition);
   }
-  input[type=text]:focus, 
-  input[type=password]:focus, 
+  input[type=text]:focus,
+  input[type=password]:focus,
   textarea:focus {
     outline: none;
     border-color: rgba(82,168,236,.75);
@@ -102,8 +102,8 @@ form {
     > label {
       color: @red;
     }
-    input[type=text], 
-    input[type=password], 
+    input[type=text],
+    input[type=password],
     textarea {
       border-color: @error-text;
       .box-shadow(0 0 3px rgba(171,41,32,.25));
@@ -304,7 +304,7 @@ ul.inputs-list {
 form.form-stacked {
   fieldset {
     padding-top: @baseline / 2;
-  }  
+  }
   legend {
     margin-left: 0;
   }
diff --git a/lib/patterns.less b/lib/patterns.less
index ba739c1f0..ed8168955 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -1,7 +1,7 @@
 /*
-	Patterns.less
-	Repeatable UI elements outside the base styles provided from the scaffolding
-*/
+ * Patterns.less
+ * Repeatable UI elements outside the base styles provided from the scaffolding
+ */
 
 
 /* Top bar
diff --git a/lib/preboot.less b/lib/preboot.less
index b91df8a62..e8b0cb755 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -1,7 +1,7 @@
 /*
-  Preboot
-  Variables and mixins to pre-ignite any new web development project
-*/
+ * Preboot.less
+ * Variables and mixins to pre-ignite any new web development project
+ */
 
 
 /* Variables
@@ -70,7 +70,7 @@
 }
 
 // Center-align a block level element
-.center-block { 
+.center-block {
 	display: block;
   margin: 0 auto;
 }
diff --git a/lib/reset.less b/lib/reset.less
index 040177b11..0a3901b4d 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,7 +1,7 @@
 /*
-  Global Reset
-	Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
-*/
+ * Reset.less
+ * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
+ */
 
 // Eric Meyer reset
 html, body { margin: 0; padding: 0; }
@@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, cod
 table { border-collapse: collapse; border-spacing: 0; }
 ol, ul { list-style: none; }
 q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-	
+
 // HTML5
 header,
 section,
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 55adceb21..f8aca54ef 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -1,7 +1,7 @@
 /*
-	Scaffolding
-	Basic and global styles for generating a grid system, structural layout, and page templates
-*/
+ * Scaffolding
+ * Basic and global styles for generating a grid system, structural layout, and page templates
+ */
 
 /* Baseline Grid System
 -------------------------------------------------- */
diff --git a/lib/tables.less b/lib/tables.less
index d0b68db9c..29405fa64 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -1,6 +1,7 @@
 /*
-  Tables
-*/
+ * Tables.less
+ * Tables for, you guessed it, tabular data
+ */
 
 
 /* Baseline styles
diff --git a/lib/type.less b/lib/type.less
index 9be433ade..07af80c1d 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -1,7 +1,7 @@
 /*
-	Typography
-	Headings, body text, lists, code, and more for a versatile and durable typography system
-*/
+ * Typography.less
+ * Headings, body text, lists, code, and more for a versatile and durable typography system
+ */
 
 
 /* Body text