From 9ac04bddc1d4314e00031460a3ab0741e94a238a Mon Sep 17 00:00:00 2001
From: Joplin Bot <bot@joplinapp.org>
Date: Tue, 31 Aug 2021 13:00:19 +0000
Subject: [PATCH] Update: joplin-plugin-conflict-resolution@1.2.2

https://github.com/joplin/plugin-conflict-resolution/compare/19de0ffd803ad5980446d7e6602fa138648246a4..9071f7966112a162acdae383272212ef08a6b8ea
---
 manifests.json                                |   6 +++---
 .../manifest.json                             |   6 +++---
 .../plugin.jpl                                | Bin 691712 -> 691712 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests.json b/manifests.json
index c640a61..f6c7025 100644
--- a/manifests.json
+++ b/manifests.json
@@ -734,7 +734,7 @@
 	"joplin-plugin-conflict-resolution": {
 		"manifest_version": 1,
 		"id": "joplin-plugin-conflict-resolution",
-		"app_min_version": "2.0.9",
+		"app_min_version": "2.0.10",
 		"version": "1.2.2",
 		"name": "Conflict Resolution",
 		"description": "A plugin that makes process of resolving conflicts easier.",
@@ -742,8 +742,8 @@
 		"homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204",
 		"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
 		"keywords": [],
-		"_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c",
-		"_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4",
+		"_publish_hash": "sha256:75c44bc3d7408733f9d25d187bef55b418ac0389c0b3a307e862aea42ca11ef7",
+		"_publish_commit": "master:9071f7966112a162acdae383272212ef08a6b8ea",
 		"_npm_package_name": "joplin-plugin-conflict-resolution"
 	},
 	"com.gitlab.BeatLink.joplin-plugin-repeating-todos": {
diff --git a/plugins/joplin-plugin-conflict-resolution/manifest.json b/plugins/joplin-plugin-conflict-resolution/manifest.json
index 4d4334e..71a26af 100644
--- a/plugins/joplin-plugin-conflict-resolution/manifest.json
+++ b/plugins/joplin-plugin-conflict-resolution/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 1,
 	"id": "joplin-plugin-conflict-resolution",
-	"app_min_version": "2.0.9",
+	"app_min_version": "2.0.10",
 	"version": "1.2.2",
 	"name": "Conflict Resolution",
 	"description": "A plugin that makes process of resolving conflicts easier.",
@@ -9,7 +9,7 @@
 	"homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204",
 	"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
 	"keywords": [],
-	"_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c",
-	"_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4",
+	"_publish_hash": "sha256:75c44bc3d7408733f9d25d187bef55b418ac0389c0b3a307e862aea42ca11ef7",
+	"_publish_commit": "master:9071f7966112a162acdae383272212ef08a6b8ea",
 	"_npm_package_name": "joplin-plugin-conflict-resolution"
 }
\ No newline at end of file
diff --git a/plugins/joplin-plugin-conflict-resolution/plugin.jpl b/plugins/joplin-plugin-conflict-resolution/plugin.jpl
index 5d1f6b04a38eb02d44d8f9fe809d2ed3463719d7..732880d030f80fd2d6ecbeecab18b2eb08a4e249 100644
GIT binary patch
delta 703
zcmaKqy-EW?6oqp)8h59WNHl063nIaQFuxhFi9dynf?ZG{L}G+A8qh)vk!TQM(g;EZ
zA>boeZfocB_yjtN+1yRx!YP(-&Yg4bo$j#M9TuPZb4*CinARyuwNNrl(dQF5?Eypp
zU@C|+SrYV*M{o#cHUXs^!zLJ;fL!v}37%O^Kt@OK5elAD+G)yZ+9~5S6G6c@d2Dh~
zM_D5%`(_10CA5gItNTVIpi(-9);AptrDmlV&IjfNLqSm&Z-LpuP$@K=&!D%zsNFo6
zWa9xd>i**DWl{x?(WtgbUSY6J@G2PBDC7>gPcKRB`c0POZgFwBUDD3l<qFB!Rt+*a
z61wl~;{0m;vU$_k2wAChZQu7u(Nk+STZg>uSAi^q?SBs*+>(#M(L^+Xq8$?x;3;q_
iR2->6CUz!%diZ@`5p;-2W2aDR?7W+V9F=__U;a0@g`rdc

delta 624
zcmZ9Kze+<f6vppq{c~>?Q4rCoAX4a*<RmvZ)#Bjf<RB^tMIC$wsZ^^7M+ZUhA{2ZC
z$2^x$P&3%%q{9b+AK!OQzGOV@ji<f$*A3}V)*7*p;be8EkRL<1o&b0Npi{<`sdfF&
zJ)8lpWzb-Pw?It>wUN;YE!xYVl5_Y1-BwULXenqpXeDUXL${<YZbED3yL#xCw9BDI
zr{cJ)k}!kT+6bGHMjRTaOoW>ieQ}7A-QuUB0f*MIa(=7H@pkPxg)%A?tfWzCbYENo
z?EB$?_=aXS5N|w9JGSJZcx>+|7Z%Iow3cbvBXPIxPwvGNe4Y#btV$!xx)4-lgCt_S
d@Qqj~8C@!QB&f}uAvHN47Gd~NG4@%^%0G?di^c!|