Resolve merging conflicts

Author: EnzeXing

tests/init/neg/closureLeak.scala

@@ -9,21 +9,5 @@ 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,22 +15,6 @@ 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())
 }