resove the conflict

lldm · Aug 29, 2016 · 8075000 · 8075000
1 parent cafb40d
commit 8075000
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/benchmarks.rb b/benchmarks.rb
@@ -3,15 +3,9 @@
 main
 main2()
 test()
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 1
 23
->>>>>>> a235715... modification from dev4
 # 2
-=======
 1
->>>>>>> 12257cf... 1
 # tetst line
 # i