fixing conflicts

library/scss/breakpoints/_768up.scss

@@ -56,13 +56,8 @@ NAVIGATION STYLES
 			has the possibility of being a mobile device.
 			*/
 			&:hover, &:focus {
-<<<<<<< HEAD:library/scss/_768up.scss
-				background-color: #dedede;
-=======
 				color: $white;
 				text-decoration: underline;
-
->>>>>>> 1.7:library/scss/breakpoints/_768up.scss
 			}
 		}
 

library/scss/partials/_normalize.scss

@@ -1,8 +1,5 @@
-<<<<<<< HEAD:library/scss/_normalize.scss
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
-=======
 /* normalize.css 2012-07-07T09:50 UTC - http://github.com/necolas/normalize.css */
->>>>>>> 1.7:library/scss/partials/_normalize.scss
+
 
 /* ==========================================================================
    HTML5 display definitions
@@ -162,15 +159,6 @@ hr {
     height: 0;
 }
 
-<<<<<<< HEAD:library/scss/_normalize.scss
-/**
- * Address styling not present in IE 8/9.
- */
-
-mark {
-    background: #ff0;
-    color: #000;
-=======
 /*
  * proper formatting (http://blog.fontdeck.com/post/9037028497/hyphens)
 */
@@ -188,7 +176,6 @@ p {
  */
 pre {
     margin: 0;
->>>>>>> 1.7:library/scss/partials/_normalize.scss
 }
 
 /**
@@ -222,11 +209,6 @@ q {
 /**
  * Address inconsistent and variable font size in all browsers.
  */
-
-<<<<<<< HEAD:library/scss/_normalize.scss
-small {
-    font-size: 80%;
-=======
 q:before,
 q:after {
     content: '';
@@ -235,7 +217,6 @@ q:after {
 
 small, .small {
     font-size: 75%;
->>>>>>> 1.7:library/scss/partials/_normalize.scss
 }
 
 /**
@@ -259,10 +240,8 @@ sub {
 }
 
 /* ==========================================================================
-<<<<<<< HEAD:library/scss/_normalize.scss
-=======
-   Lists
-   ========================================================================== */
+  Lists
+========================================================================== */
 
 /*
  * Addresses margins set differently in IE6/7.
@@ -304,9 +283,8 @@ nav ol {
 }
 
 /* ==========================================================================
->>>>>>> 1.7:library/scss/partials/_normalize.scss
-   Embedded content
-   ========================================================================== */
+  Embedded content
+========================================================================== */
 
 /**
  * Remove border when inside `a` element in IE 8/9.
@@ -490,36 +468,6 @@ table {
 }
 
 
-<<<<<<< HEAD:library/scss/_normalize.scss
-// proper formatting (http://blog.fontdeck.com/post/9037028497/hyphens) 
-p {
-   -webkit-hyphens: auto;
-   -epub-hyphens:   auto;
-   -moz-hyphens:    auto;
-   hyphens:         auto;
-}
-
-b, strong, .strong { font-weight: bold; }
-
-dfn, em, .em { font-style: italic; }
-
-small, .small { font-size: 75%; }
-
-ul, ol {
-        padding: 0;
-        list-style-type: none;
-}
-
-dd {
-        margin: 0;
-}
-
-.sidebar ul,
-.sidebar ol,
-.commentlist {
-        list-style: none;
-}
-=======
 // BORDER-BOX ALL THE THINGS! (http://paulirish.com/2012/box-sizing-border-box-ftw/)
 * {
     -webkit-box-sizing: border-box;
@@ -550,4 +498,3 @@ span.amp {
   font-family: Baskerville,'Goudy Old Style',Palatino,'Book Antiqua',serif !important;
   font-style: italic;
 }
->>>>>>> 1.7:library/scss/partials/_normalize.scss