clean up merge conflict

scss/README.md

@@ -11,26 +11,7 @@ The `scss/` directory contains three folders: Base, UI and Vendor.
 
 ## Compilation
 
-<<<<<<< HEAD
-All partials are imported into the `_manifest.scss`. This is also where you can choose to import either Normalize (default) or CSS Reset. When you add new partials to your project, add them to this import list. `_manifest.scss` is then imported into the two main stylesheets, `application.scss` and `application-ie.scss`. Set up your Sass compilation to generate these in the `stylesheets/` directory. Because of the amount of comments, remember to use minified CSS in production.
-
-### Legacy IE Support
-
-After compilation you will have two stylesheets, `application.css` and `application-ie.css`. The only difference between these files lies in the `$legacy-ie` variable. When set to true, the `media()` mixin will only render the content inside appropriate media query breakpoints. Taking advantage of CSS inheritance, the site will render the desktop layout in legacy browsers that don't support media queries (IE8 and below). Therefore, these should be loaded into the site via conditional comments.
-
-Example:
-~~~html
-<!--[if (gt IE 8) | (IEMobile)]><!-->
-  <link href="/stylesheets/application.css" media="all" rel="stylesheet" type="text/css" />
-<!--<![endif]-->
-
-<!--[if (lt IE 9) & (!IEMobile)]>
-  <link href="/stylesheets/application-ie.css" media="all" rel="stylesheet" type="text/css" />
-<![endif]-->
-~~~
-=======
 All partials are imported into the `application.scss`. This is also where you can choose to import either Normalize (default) or CSS Reset. When you add new partials to your project, add them to this import list. Set up your Sass compilation to generate this in the `stylesheets/` directory. Because of the amount of comments, please use minified CSS in production.
->>>>>>> master
 
 ### Styleguide
 

styleguide.html

@@ -365,10 +365,6 @@ <h2 class="sg-heading">Form Fields</h2>
               <label for="password">Password</label>
               <input type="password" placeholder="Type your Password" id="password" class="form-control">
             </div>
-            <div class="form-group">
-              <label for="url">Web Address</label>
-              <input type="url" placeholder="http://yoursite.com" id="url" class="form-control">
-            </div>
             <div class="form-group">
               <label for="email">Email Address</label>
               <input type="email" placeholder="[email protected]" id="email" class="form-control">