resolve conflict

Author: EnzeXing

scaladoc-js/resources/scaladoc-searchbar.css

@@ -95,12 +95,18 @@
 .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,
@@ -109,12 +115,16 @@
      */
     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 {
@@ -146,6 +156,7 @@
     border-radius: 12px;
     box-shadow: 0 0 2px black;
 <<<<<<< HEAD
+<<<<<<< HEAD
 }
 
 .snippet-comment-button:hover {
@@ -165,6 +176,10 @@
 >>>>>>> Add tests
 }
 
+=======
+}
+
+>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
 .snippet-comment-button:hover {
     background:
         linear-gradient(#444, #444),

tests/init/neg/closureLeak.scala

@@ -10,14 +10,20 @@ class Outer {
     val l: List[A] = List(new A(5), new A(10))
     l.foreach(a => a.addX(this)) // error
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
 <<<<<<< HEAD
     val y = 10
 =======
 >>>>>>> a163464749... Update closureLeak.scala
 =======
     val p = 10
 >>>>>>> 5e4f243160... re-organize tests
+<<<<<<< HEAD
 >>>>>>> Add tests
+=======
+>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
 }

tests/init/neg/leak-warm.scala

@@ -15,16 +15,22 @@ object leakWarm {
     }
     val c = new C(1, 2)
     val d = new D(3, 4)
+<<<<<<< HEAD
 <<<<<<< HEAD
     val l: List[A] = List(c, d) // error
 =======
+=======
+>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
     val l: List[A] = List(c, d) // error // error
 <<<<<<< HEAD
 =======
     val l: List[A] = List(c, d) // error
 >>>>>>> 93ec7cb48e... Update leak-warm.scala
 =======
 >>>>>>> 5e4f243160... re-organize tests
+<<<<<<< HEAD
 >>>>>>> Add tests
+=======
+>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
     val l2 = l.map(_.m())
 }