Version 1.0

timholy · timholy · commit ade8a816c753 · 2020-01-18T12:25:59.000-06:00
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,10 @@
 name = "OffsetArrays"
 uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
+<<<<<<< HEAD
 version = "0.11.4"
+=======
+version = "1.0.0"
+>>>>>>> 8e16ab8... Version 1.0
 
 [compat]
 julia = "0.7, 1"
