merge: resolve conflicts again

tari-project · Dec 5, 2024 · fdec942 · fdec942
2 parents 6ea58b8 + fb98ff3
commit fdec942
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.8.5",
+    "version": "0.8.6",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -4,7 +4,7 @@ description = "Tari Universe"
 edition = "2021"
 name = "tari-universe"
 repository = "https://github.com/tari-project/universe"
-version = "0.8.5"
+version = "0.8.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/src-tauri/binaries_versions_esmeralda.json b/src-tauri/binaries_versions_esmeralda.json
@@ -4,7 +4,7 @@
         "mmproxy": "=1.9.1-pre.0",
         "minotari_node": "=1.9.1-pre.0",
         "wallet": "=1.9.1-pre.0",
-        "sha-p2pool": "=0.14.1",
+        "sha-p2pool": "=0.15.0",
         "xtrgpuminer": "=0.2.9",
         "tor": "=13.5.7"
     }

diff --git a/src-tauri/binaries_versions_nextnet.json b/src-tauri/binaries_versions_nextnet.json
@@ -4,7 +4,7 @@
         "mmproxy": "=1.9.1-rc.0",
         "minotari_node": "=1.9.1-rc.0",
         "wallet": "=1.9.1-rc.0",
-        "sha-p2pool": "=0.14.1",
+        "sha-p2pool": "=0.15.0",
         "xtrgpuminer": "=0.2.9",
         "tor": "=13.5.7"
     }

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.8.4",
+    "version": "0.8.6",
     "productName": "Tari Universe (Alpha)",
     "mainBinaryName": "Tari Universe (Alpha)",
     "identifier": "com.tari.universe.alpha",