From 7453173f960597ac438dafaa165dd6d82fec1bba Mon Sep 17 00:00:00 2001 From: Joplin Bot Date: Sun, 18 Jul 2021 21:30:12 +0000 Subject: [PATCH] Update: joplin-plugin-conflict-resolution@1.1.0 https://github.com/joplin/plugin-conflict-resolution/compare/12a7dfe30a85c961060281adcbed87c5dc09f16e..9d548323b163f388fc42f3e952f0e67d191d63f3 --- README.md | 2 +- manifests.json | 8 ++++---- .../manifest.json | 8 ++++---- .../plugin.jpl | Bin 682496 -> 683520 bytes 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f68f7e5..b373ed5 100644 --- a/README.md +++ b/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 diff --git a/manifests.json b/manifests.json index bf25e24..77d554c 100644 --- a/manifests.json +++ b/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": { diff --git a/plugins/joplin-plugin-conflict-resolution/manifest.json b/plugins/joplin-plugin-conflict-resolution/manifest.json index 74ea340..d4c9cf6 100644 --- a/plugins/joplin-plugin-conflict-resolution/manifest.json +++ b/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" } \ 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 fb02f7ca3cdef762947d2239a84151a41bec9ad7..3605bd6f67f721ce0258e6f1d3818f9a724b5cdf 100644 GIT binary patch delta 1649 zcmb7F&x;#X9PjJ4HTho3YQc6F;W1^&#%+?B%uGVFNpRD3L2YGqld1)gN#-SabTSiX zUb2g2X>~ylqu>wBL(sD)LA~VGlP7P29t08b;K7T3LVYunOr}ji47|(xd_SM>=Y8IH zUhe&zz4u%8;}2JLMbU~%`IIb|)sl`+$)6d>JV9uR5b|3KSkX$VGJ~h+HRPX9Vw$$V zddTNVtf;9m?*Z~Rl9(dTu@BJ3X|YzsIwRIuvCfJ0#1w6${HGHfRoCV=r>K_lFDEcv zEo*TvBju|}OfShX_Ib)bPGDMDDaY7TY5$7^rpgKb-=zJW1g7hWO#Vrq+_DlgV@nk*DS2i3b{#%Kljq>Q^?>!LP_Za44zL3S z^kiSbcL0muz;Juiu3(vOHK5P$H{ixyfXgN|ET`9`%p$YGu4A*DN8ce8tjWWp?U2pL z5z84C?Foeru^Dl<;W(xrjN0t+3Ik%&(IBcFIAanvYK$0jYUJsea9|yB6&*{3`JrYsAD|RSSKk z4%K0zc%G0{-?xb25$uvNC5O1}us*gOMm%iTrnscr1hYQD#&GC5Lzfzi;EvR zw0}jD7sV8p%JT9Q%j)72eF-+wXJ{91^6y%(wSsFk{%#Z2`40!Mn##^*mjB*@XO!4u zWFV8xdxY&U=2BsTY-UXA8EuQ0nJbvNBa+?btFN5B!2f8$y0*-9NwD`gdNvxgV~(5f z*YtD?E}{$69*&q0-pt}!eeP=OCY*%U^8Zhse{}$v$}-0=&F9DB>$^@pMr`74W;$Z@ zZU=42IN4al@hm^zgcSefI$R2~Iv1G^?Oa`!{*R=>3qKZ#eSZ^voV*T+KLtfq%Zu0c a4e(bIub-;xrTEo+^AW75E-(Wgr2Yj=mf#cs delta 757 zcmZ9K&1+LZ6vcb(hwt5u6h+Z)9w{LPYMswFrIJdksFjpLMOw8AkN8XjHYsT+LMfD{ z;9^=R6f?MT>B{x|53bz^F8T)uuH1?36wJ$*fwTH?&zw1Tc7GIizZH)TMp>*VSA2jF z#g&W($Z-O%+W-~-^wS=uA{O)?wy+HPlFx+fu_|ceGbVX9cM3Z1GfKPcJ>)Mq4LS`u z4LglEU9^x7^fhmWOWBQSp%mzGk4Zs9c2^Q;?lY-K#y$jk$74bB6 zJ?k+ky-t3G?S<>Y`A|VrRx2ff#hG^rpTku;IhC8hFt?R9H*1Z0ZaT`*Nn$r=@DR-3 zySP6_#Cb3O`!GgX<}-`8!91M9N_4-rRZicuqHT=aSx=hPTK!hDR$XgNM^j|uo%u9} zE9S{7{M~tg?Hh!-^7@Q<+zt5I6$<9$5iX7_rR$AWYScWgnxFH?hs%vh^41m}<9D#+ z50s!&#=S8q&Oc3`q2Jg7=0kID8Bc6s1+TzpWi6>!)51h_vlx|TTx_%W4BJCH#XD%? o7x?vf1NJ+s=zUDe1?g@4CF((M16*d|EhK%6iSENJq<9*f0Y2uqHvj+t