Resolved merge conflicts in manifest.json and versions.json

ubuntupunk · Dec 20, 2024 · 4f2bc42 · 4f2bc42
2 parents 4d53a18 + aae8dc0
commit 4f2bc42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/manifest.json b/manifest.json
@@ -8,4 +8,8 @@
 	"fundingUrl": "https://buymeacoffee.com/ubuntupunk",
 	"isDesktopOnly": false,
 	"version": "1.0.7"
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> aae8dc01cdb5d865e727197714de743f703af816
diff --git a/versions.json b/versions.json
@@ -3,6 +3,12 @@
 	"1.0.1": "0.15.0",
 	"undefined": "0.15.0",
 	"1.0.2": "0.15.0",
+<<<<<<< HEAD
 	"1.0.6": "0.15.0",
 	"1.0.7": "0.15.0"
-}
+}
+=======
+	"1.0.6": "0.15.0"
+	"1.0.7": "0.15.0"
+}
+>>>>>>> aae8dc01cdb5d865e727197714de743f703af816