Skip to content

Commit 3216c8a

Browse files
committed
Resolve merging conflicts
1 parent e171ce6 commit 3216c8a

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

tests/init/neg/closureLeak.scala

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,5 @@ class Outer {
99

1010
val l: List[A] = List(new A(5), new A(10))
1111
l.foreach(a => a.addX(this)) // error
12-
<<<<<<< HEAD
13-
<<<<<<< HEAD
14-
=======
15-
<<<<<<< HEAD
16-
=======
17-
>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
18-
<<<<<<< HEAD
1912
val y = 10
20-
=======
21-
>>>>>>> a163464749... Update closureLeak.scala
22-
=======
23-
val p = 10
24-
>>>>>>> 5e4f243160... re-organize tests
25-
<<<<<<< HEAD
26-
>>>>>>> Add tests
27-
=======
28-
>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
2913
}

tests/init/neg/leak-warm.scala

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,6 @@ object leakWarm {
1515
}
1616
val c = new C(1, 2)
1717
val d = new D(3, 4)
18-
<<<<<<< HEAD
19-
<<<<<<< HEAD
20-
val l: List[A] = List(c, d) // error
21-
=======
22-
=======
23-
>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
2418
val l: List[A] = List(c, d) // error // error
25-
<<<<<<< HEAD
26-
=======
27-
val l: List[A] = List(c, d) // error
28-
>>>>>>> 93ec7cb48e... Update leak-warm.scala
29-
=======
30-
>>>>>>> 5e4f243160... re-organize tests
31-
<<<<<<< HEAD
32-
>>>>>>> Add tests
33-
=======
34-
>>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
3519
val l2 = l.map(_.m())
3620
}

0 commit comments

Comments
 (0)