Resolved merge conflicts in manifest.json and versions.json

ubuntupunk · Dec 23, 2024 · b545628 · b545628
1 parent 60fa0aa
commit b545628
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [1.07] - 2024-12-20
+## [1.0.7] - 2024-12-20
 ### Added
 - Introduced custom inputs for selecting century and decade in the On This Day feature.
 - Implemented filtering logic for fetching quotes based on user-defined century and decade.
@@ -12,14 +12,18 @@
 ### Removed
 - Deprecated the dropdowns for selecting century and decade in favor of custom input fields.
 
-## [1.06] - 2024-12-19
+## [1.0.6] - 2024-12-19
 ### Added
 - Initial release of the On This Day feature.
 - Fetch historical quotes based on the current date.
 
 ### Changed
 - Various UI improvements and bug fixes.
 
+## [Unreleased]
+### Added
+- Implemented toggle for On This Day Quotes.
+
 ## [v1.0.6] - 2024-12-19
 - Added ZenQuotes API attribution to settings page
 - Fixed image fetching and storage functionality

diff --git a/manifest.json b/manifest.json
@@ -7,5 +7,5 @@
 	"authorUrl": "https://github.com/ubuntupunk",
 	"fundingUrl": "https://buymeacoffee.com/ubuntupunk",
 	"isDesktopOnly": false,
-	"version": "1.0.7"
-}
+	"version": "1.0.11"
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xenquotes",
-	"version": "1.0.7",
+	"version": "1.0.11",
 	"description": "This is a simple daily quote plugin for Obsidian",
 	"main": "main.js",
 	"scripts": {

diff --git a/versions.json b/versions.json
@@ -3,12 +3,7 @@
 	"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
+	"1.0.7": "0.15.0",
+	"1.0.11": "0.15.0"
+}