chore: release v0.1.18

murdercode · murdercode · commit 84a58fae1ee4 · 2025-06-17T16:40:48.000+02:00
diff --git a/package.json b/package.json
@@ -1,11 +1,7 @@
 {
   "name": "presto",
   "private": true,
-<<<<<<< HEAD
-  "version": "0.1.17",
-=======
-  "version": "0.1.15",
->>>>>>> 11e6dd124d22af31c2f18ecf69ac2532599dc7b1
+  "version": "0.1.18",
   "type": "module",
   "scripts": {
     "tauri": "tauri",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,10 +1,6 @@
 [package]
 name = "presto"
-<<<<<<< HEAD
-version = "0.1.17"
-=======
-version = "0.1.15"
->>>>>>> 11e6dd124d22af31c2f18ecf69ac2532599dc7b1
+version = "0.1.18"
 description = "A Tauri App"
 authors = ["Stefano Novelli"]
 edition = "2021"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,11 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "presto",
-<<<<<<< HEAD
-  "version": "0.1.17",
-=======
-  "version": "0.1.15",
->>>>>>> 11e6dd124d22af31c2f18ecf69ac2532599dc7b1
+  "version": "0.1.18",
   "identifier": "com.presto.app",
   "build": {
     "frontendDist": "../src"
