Skip to content

Commit 7bd8590

Browse files
committed
Solved merge conflict
1 parent 3795444 commit 7bd8590

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Test$.main(Test.scala:8)
2+
Test$.main(Test.scala:10)

0 commit comments

Comments
 (0)