File tree 2 files changed +0
-32
lines changed 2 files changed +0
-32
lines changed Original file line number Diff line number Diff line change @@ -9,21 +9,5 @@ class Outer {
9
9
10
10
val l : List [A ] = List (new A (5 ), new A (10 ))
11
11
l.foreach(a => a.addX(this )) // error
12
- <<<<<<< HEAD
13
- <<<<<<< HEAD
14
- =======
15
- <<<<<<< HEAD
16
- =======
17
- >>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
18
- <<<<<<< HEAD
19
12
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
29
13
}
Original file line number Diff line number Diff line change @@ -15,22 +15,6 @@ object leakWarm {
15
15
}
16
16
val c = new C (1 , 2 )
17
17
val d = new D (3 , 4 )
18
- <<<<<<< HEAD
19
- <<<<<<< HEAD
20
- val l : List [A ] = List (c, d) // error
21
- =======
22
- =======
23
- >>>>>>> 8ee622a0c755f23d1c63ec548a85ea9cbab1d48f
24
18
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
35
19
val l2 = l.map(_.m())
36
20
}
You can’t perform that action at this time.
0 commit comments