Updated requirements

matteoacrossi · May 4, 2018 · f152b76 · f152b76
1 parent f5c9fe9
commit f152b76
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,5 +1 @@
-<<<<<<< HEAD
 julia 0.6 0.6
-=======
-julia 0.6
->>>>>>> e1406b6c30cd5236da771336c97f85a456c518c3