Resolve scaladoc-searchbar.css

Author: EnzeXing

scaladoc-js/resources/scaladoc-searchbar.css

@@ -94,19 +94,8 @@
 
 .scaladoc-searchbar-result a {
     color: #1f2326;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
     text-indent: -20px;
     padding-left: 20px;
-=======
->>>>>>> Add tests
-=======
-    text-indent: -20px;
-    padding-left: 20px;
-=======
->>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
     /* for some reason, with display:block if there's a wrap between the
      * search result text and the location span, the dead space to the
      * left of the location span doesn't get treated as part of the block,
@@ -115,16 +104,8 @@
      */
     display: inline-block;
     width: 100%;
-<<<<<<< HEAD
-<<<<<<< HEAD
     text-indent: -20px;
     padding-left: 20px;
-=======
->>>>>>> 89a6409cd0... Improvements to search UX
->>>>>>> Add tests
-=======
->>>>>>> 89a6409cd0... Improvements to search UX
->>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
 }
 
 .scaladoc-searchbar-result .scaladoc-searchbar-location {
@@ -155,8 +136,6 @@
     background-repeat: no-repeat;
     border-radius: 12px;
     box-shadow: 0 0 2px black;
-<<<<<<< HEAD
-<<<<<<< HEAD
 }
 
 .snippet-comment-button:hover {
@@ -172,14 +151,8 @@
 .hide-snippet-comments-button {
     -ms-transform: rotate(45deg);
     transform: rotate(45deg);
-=======
->>>>>>> Add tests
-}
-
-=======
 }
 
->>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
 .snippet-comment-button:hover {
     background:
         linear-gradient(#444, #444),