conflicts

François Guyot · François Guyot · commit 6fc74707fd7e · 2023-06-05T07:55:20.000Z
diff --git a/package/version b/package/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.1.306
-=======
 0.1.318
->>>>>>> textual-bump
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,11 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyk"
-<<<<<<< HEAD
-version = "0.1.306"
-=======
 version = "0.1.318"
->>>>>>> textual-bump
 description = ""
 authors = [
     "Runtime Verification, Inc. <contact@runtimeverification.com>",

-Original file line number
+Diff line change
@@ @@ -1,5 +1 @@ @@
 -<<<<<<< HEAD
 -0.1.306
 -=======
 .1.318
 ->>>>>>> textual-bump