From: Marco Biedermann <marco.biedermann@gmx.de>
Date: Mon, 2 Mar 2015 17:15:01 +0000 (+0100)
Subject: remove git conflicts
X-Git-Tag: v5.5.2~69^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6338%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

remove git conflicts
---

diff --git a/doc/includes/dropdown_buttons/examples_dropdown_button_basic.html b/doc/includes/dropdown_buttons/examples_dropdown_button_basic.html
index 863ea9575..8869dfb2a 100644
--- a/doc/includes/dropdown_buttons/examples_dropdown_button_basic.html
+++ b/doc/includes/dropdown_buttons/examples_dropdown_button_basic.html
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 <button data-dropdown="drop1" aria-controls="drop1" aria-expanded="false" class="button dropdown">Dropdown Button</button><br>
 <ul id="drop1" data-dropdown-content class="f-dropdown" aria-hidden="true" tabindex="-1">
-=======
-<button href="#" data-dropdown="drop1" aria-controls="drop1" aria-expanded="false" class="button dropdown">Dropdown Button</button><br>
-<ul id="drop1" data-dropdown-content class="f-dropdown" aria-hidden="true">
->>>>>>> 33575ddf283b97c0d6f96ffa2891d515195ccbbc
   <li><a href="#">This is a link</a></li>
   <li><a href="#">This is another</a></li>
   <li><a href="#">Yet another</a></li>
diff --git a/doc/includes/dropdown_buttons/examples_dropdown_button_intro.html b/doc/includes/dropdown_buttons/examples_dropdown_button_intro.html
index 33d80f780..c0b463814 100644
--- a/doc/includes/dropdown_buttons/examples_dropdown_button_intro.html
+++ b/doc/includes/dropdown_buttons/examples_dropdown_button_intro.html
@@ -6,11 +6,7 @@
 </ul>
 
 <button data-dropdown="drop2" class="small secondary radius button dropdown" aria-expanded="false" aria-controls="drop2">Dropdown Button</button><br>
-<<<<<<< HEAD
 <ul id="drop2" data-dropdown-content class="f-dropdown" aria-hidden="true" tabindex="-1">
-=======
-<ul id="drop2" data-dropdown-content class="f-dropdown" aria-hidden="true">
->>>>>>> 33575ddf283b97c0d6f96ffa2891d515195ccbbc
   <li><a href="#">This is a link</a></li>
   <li><a href="#">This is another</a></li>
   <li><a href="#">Yet another</a></li>
diff --git a/doc/includes/topbar/examples_topbar_variables.html b/doc/includes/topbar/examples_topbar_variables.html
index d5c733b5f..a12bf9646 100644
--- a/doc/includes/topbar/examples_topbar_variables.html
+++ b/doc/includes/topbar/examples_topbar_variables.html
@@ -67,13 +67,8 @@ $topbar-menu-icon-position: $opposite-direction; // Change to $default-float for
 // Transitions and breakpoint styles
 $topbar-transition-speed: 300ms;
 // Using rem-calc for the below breakpoint causes issues with top bar
-<<<<<<< HEAD
 $topbar-breakpoint: #{lower-bound($medium-range)}; // Change to 9999px for always mobile layout
 $topbar-media-query: $medium-up;
-=======
-$topbar-breakpoint: #{lower-bound($medium-range)} !default; // Change to 9999px for always mobile layout
-$topbar-media-query: "#{$screen} and (min-width:#{lower-bound($topbar-breakpoint)})";
->>>>>>> pr/5996
 
 // Divider Styles
 $topbar-divider-border-bottom: solid 1px scale-color($topbar-bg-color, $lightness: 13%);