rebase

status-im/status-go@d7e7792...d7e7792
status-im · Dec 6, 2023 · ad0d29b · ad0d29b
1 parent 69bfaa9
commit ad0d29b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/status-go-version.json b/status-go-version.json
@@ -5,6 +5,7 @@
     "repo": "status-go",
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     "version": "v0.171.28",
     "commit-sha1": "d7e7792b51f79e8cbebc9f59de79e64b6f6e684a",
@@ -35,4 +36,9 @@
     "commit-sha1": "1174e1e43c0fbffaa21c9401c29e98cbdc37557c",
     "src-sha256": "1q5l9aimdiyryzvbd10djvz5ghg6ccaghwmqp2456skbvflpbyr2"
 >>>>>>> c624805bb (rebase)
+=======
+    "version": "v0.171.28",
+    "commit-sha1": "d7e7792b51f79e8cbebc9f59de79e64b6f6e684a",
+    "src-sha256": "0y0di4jfmk93pqc4i9fsgasrhqgvwh46ly5h04m87pm611faa2ay"
+>>>>>>> 809b384d1 (rebase)
 }