From 6d74eecd2b85dd9cb2211fcddb289ae8d06e5b03 Mon Sep 17 00:00:00 2001
From: Tim Carry <tim@pixelastic.com>
Date: Tue, 6 Nov 2018 08:59:01 +0100
Subject: [PATCH] Remove git markers in file (#524)

---
 src/styles/_dropdown.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/styles/_dropdown.scss b/src/styles/_dropdown.scss
index f2dd6bf0..c48af97d 100644
--- a/src/styles/_dropdown.scss
+++ b/src/styles/_dropdown.scss
@@ -350,12 +350,9 @@
         background-color: $code-background;
         border-radius: 3px;
         font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
-<<<<<<< HEAD
-=======
         .algolia-docsearch-suggestion--highlight {
           background: none;
         }
->>>>>>> master
       }
 
       // Rules to display categories and subcategories