Update: joplin-plugin-conflict-resolution@1.1.0

12a7dfe30a..9d548323b1

README.md

@@ -17,7 +17,7 @@ This repository contains the following plugins:
 [🏠](https://discourse.joplinapp.org/t/insert-referencing-notes-backlinks-plugin/13632) | Automatic Backlinks to note | 2.0.10 | Creates backlinks to opened note, also in automatic way | ambrt
 [🏠]() | BibTeX | 0.3.0 | Use locally stored BibTeX files to integrate citation into Joplin | Abdallah Ahmed
 [🏠](https://github.com/JackGruber/joplin-plugin-combine-notes) | Combine notes | 0.2.2 | Combine one or more notes | JackGruber
-[🏠](https://github.com/joplin/plugin-conflict-resolution) | Conflict Resolution | 1.0.0 | A plugin that makes process of resolving conflicts easier. | Ahmed Alwasifey
+[🏠](https://github.com/joplin/plugin-conflict-resolution) | Conflict Resolution | 1.1.0 | A plugin that makes process of resolving conflicts easier. | Ahmed Alwasifey
 [🏠](https://discourse.joplinapp.org/t/create-note-from-highlighted-text/12511) | Convert Text To New Note | 1.5.0 | Converts highlighted text to new one in same folder | ambrt
 [🏠](https://discourse.joplinapp.org/t/copy-markdown-link-to-active-note/14402) | Copy link to active note | 1.0.1 | Adds entry to right click menu in editor to get link to active note | a  
 [🏠](https://discourse.joplinapp.org/t/go-to-note-tag-or-notebook-via-highlighting-text-in-editor/12731) | Create and go to #tags and @notebooks | 1.3.7 | Go to tag,notebook or note via links or via text | a  

manifests.json

@@ -730,16 +730,16 @@
 	"joplin-plugin-conflict-resolution": {
 		"manifest_version": 1,
 		"id": "joplin-plugin-conflict-resolution",
-		"app_min_version": "1.8",
-		"version": "1.0.0",
+		"app_min_version": "2.0.9",
+		"version": "1.1.0",
 		"name": "Conflict Resolution",
 		"description": "A plugin that makes process of resolving conflicts easier.",
 		"author": "Ahmed Alwasifey",
 		"homepage_url": "https://github.com/joplin/plugin-conflict-resolution",
 		"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
 		"keywords": [],
-		"_publish_hash": "sha256:a8bfe95c74eaa082cdddf40892d370ed713c515a2fd0aa842c9562ad63eb7c13",
-		"_publish_commit": "master:12a7dfe30a85c961060281adcbed87c5dc09f16e",
+		"_publish_hash": "sha256:81a7102669ba95b8a4b8c22a9e6e11afe22c0980346535e0cc09de16212d4f82",
+		"_publish_commit": "master:9d548323b163f388fc42f3e952f0e67d191d63f3",
 		"_npm_package_name": "joplin-plugin-conflict-resolution"
 	},
 	"com.gitlab.BeatLink.joplin-plugin-repeating-todos": {

plugins/joplin-plugin-conflict-resolution/manifest.json

@@ -1,15 +1,15 @@
 {
 	"manifest_version": 1,
 	"id": "joplin-plugin-conflict-resolution",
-	"app_min_version": "1.8",
-	"version": "1.0.0",
+	"app_min_version": "2.0.9",
+	"version": "1.1.0",
 	"name": "Conflict Resolution",
 	"description": "A plugin that makes process of resolving conflicts easier.",
 	"author": "Ahmed Alwasifey",
 	"homepage_url": "https://github.com/joplin/plugin-conflict-resolution",
 	"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
 	"keywords": [],
-	"_publish_hash": "sha256:a8bfe95c74eaa082cdddf40892d370ed713c515a2fd0aa842c9562ad63eb7c13",
-	"_publish_commit": "master:12a7dfe30a85c961060281adcbed87c5dc09f16e",
+	"_publish_hash": "sha256:81a7102669ba95b8a4b8c22a9e6e11afe22c0980346535e0cc09de16212d4f82",
+	"_publish_commit": "master:9d548323b163f388fc42f3e952f0e67d191d63f3",
 	"_npm_package_name": "joplin-plugin-conflict-resolution"
 }