refactor

status-im · Dec 9, 2022 · 2e1eda6 · 2e1eda6
1 parent 7ad397a
commit 2e1eda6
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/status-go-version.json b/status-go-version.json
@@ -3,19 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-<<<<<<< HEAD
-<<<<<<< HEAD
     "version": "v0.115.6",
     "commit-sha1": "a97b5527305b9f23b15246c5489726f8cd758edd",
     "src-sha256": "18x506xrxbpabfy0vn82bzyd0f6zmr5khclqbzfwymi5d1m35cjm"
-=======
-    "version": "3745ec03efdf16c231e3df74da0c51af2480107e",
-    "commit-sha1": "3745ec03efdf16c231e3df74da0c51af2480107e",
-    "src-sha256": "1hikww0y1p70pr5ga3jnz72zc27k0zqjp9vk79ww9fw0165yi1h0"
->>>>>>> 0658974a7... refactor
-=======
-    "version": "v0.115.5",
-    "commit-sha1": "684e9654de4800df619ce593b5d331ebea9ed1a8",
-    "src-sha256": "0ci1s3w5jnf6sz2b6hn30gy14hp142gic006r6c3g5ln8y19wdbi"
->>>>>>> 78518d239... refactor
 }