From e835d73f83e3ba29af698fcc60fcc9db58c6b41a Mon Sep 17 00:00:00 2001 From: Joplin Bot Date: Wed, 18 Aug 2021 23:00:14 +0000 Subject: [PATCH] Update: joplin-plugin-conflict-resolution@1.2.2 https://github.com/joplin/plugin-conflict-resolution/compare/8703fe0d8ec329635d683dc48eac74f848e63696..19de0ffd803ad5980446d7e6602fa138648246a4 --- README.md | 2 +- manifests.json | 6 +++--- .../manifest.json | 6 +++--- .../plugin.jpl | Bin 688128 -> 691712 bytes 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1257983..bb6603f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This repository contains the following plugins: | [🏠](https://discourse.joplinapp.org/t/insert-referencing-notes-backlinks-plugin/13632) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.backlinksToNote/plugin.jpl) | Automatic Backlinks to note | 2.0.10 | Creates backlinks to opened note, also in automatic way | ambrt | | - | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/com.xUser5000.bibtex/plugin.jpl) | BibTeX | 0.5.0 | Use locally stored BibTeX files to integrate citation into Joplin | Abdallah Ahmed | | [🏠](https://github.com/JackGruber/joplin-plugin-combine-notes) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/io.github.jackgruber.combine-notes/plugin.jpl) | Combine notes | 1.0.1 | Combine one or more notes | JackGruber | -| [🏠](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin-plugin-conflict-resolution/plugin.jpl) | Conflict Resolution | 1.2.1 | A plugin that makes process of resolving conflicts easier. | Ahmed Alwasifey | +| [🏠](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin-plugin-conflict-resolution/plugin.jpl) | Conflict Resolution | 1.2.2 | A plugin that makes process of resolving conflicts easier. | Ahmed Alwasifey | | [🏠](https://discourse.joplinapp.org/t/create-note-from-highlighted-text/12511) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.convertToNewNote/plugin.jpl) | 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) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.copyNoteLink/plugin.jpl) | 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) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.goToItem/plugin.jpl) | 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 2b46f94..784bdf7 100644 --- a/manifests.json +++ b/manifests.json @@ -735,15 +735,15 @@ "manifest_version": 1, "id": "joplin-plugin-conflict-resolution", "app_min_version": "2.0.9", - "version": "1.2.1", + "version": "1.2.2", "name": "Conflict Resolution", "description": "A plugin that makes process of resolving conflicts easier.", "author": "Ahmed Alwasifey", "homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204", "repository_url": "https://github.com/joplin/plugin-conflict-resolution", "keywords": [], - "_publish_hash": "sha256:7e5a07dcab27c6c081c9ff75170e6ed8861a43c5be025ca901ad1dc69dcbeee9", - "_publish_commit": "master:8703fe0d8ec329635d683dc48eac74f848e63696", + "_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c", + "_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4", "_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 9e95b63..4d4334e 100644 --- a/plugins/joplin-plugin-conflict-resolution/manifest.json +++ b/plugins/joplin-plugin-conflict-resolution/manifest.json @@ -2,14 +2,14 @@ "manifest_version": 1, "id": "joplin-plugin-conflict-resolution", "app_min_version": "2.0.9", - "version": "1.2.1", + "version": "1.2.2", "name": "Conflict Resolution", "description": "A plugin that makes process of resolving conflicts easier.", "author": "Ahmed Alwasifey", "homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204", "repository_url": "https://github.com/joplin/plugin-conflict-resolution", "keywords": [], - "_publish_hash": "sha256:7e5a07dcab27c6c081c9ff75170e6ed8861a43c5be025ca901ad1dc69dcbeee9", - "_publish_commit": "master:8703fe0d8ec329635d683dc48eac74f848e63696", + "_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c", + "_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4", "_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 32f7a85d7b7bebbc718fe022af9fa5d37f3ed35f..5d1f6b04a38eb02d44d8f9fe809d2ed3463719d7 100644 GIT binary patch delta 3714 zcmbtX-HzKt7+q&unl%!rP*_p1XlPZHu9)~g5#gexyGvWN+pV@mRiz5y*t3a=<1zMR ze?Y~HxZuKEAR%EP@d}8`h)W)TSKu9Z0m}G);yCH9h-4}DnK^U5Z_a!(b8@nN^6UDK zKV0l6Vp~>}B~k1snhci2pLEXrj^idA$AyneSW??^JA)_O6E1v}#Z;xlEG~>#OjgCB zAJ+)4v6v+0*!SG^27Q+4bB;de>GKkOE=;)V&2W|JqiAX_bHd$hhF2L(Q#w*HmeC9q z7SlAXz@ldOjKS27q!!p4E8#B;rihIG-&ewq7);ZcocyyA?l73BO67Prd7tCt$@mt( z+F;tq9Y)gzf3p0xBuX7BMN%a?AKA=EvMiSJ?(pilfaisE@aXQ=&b|A0z`DR&jyopc zYaY;F4|^u^xkckK4h9gPdBZx-vx?$lzvazbm#Yr zZeMA<)}Ny7>Bg|{;jv>DBRu0%UEO_bP`CoD~(IRLit*jp}I^|Lsh4;*#!=E5Hn;Neik+!6FLcq zHj4gQYc$_VRdomWfKC~kp+w{6LX9x#6)P>m>*@xv4$v&q;%H&oEe|?(P&JS|v3V?K z$bLZmy0N=S4ZF9uy9XXVda|8aHvt~p+u8&l@9pk@Pj(+r1U%gRbZ=uT>Cy!QLR`Nq z2z`qT#=Vw-M}n=7J>(Es7E)UaJsbA~6CDUt)KKpuU(j6_n#dm#?9!fNOSq2-+A=MI zz2xt0Y#s|6*hD*)=h1KF-xl$Yu5K$INb%C*TP2VMo|(dO2FSArc-I=a*dw|_;?Q=<$B9~uu`FX6fmt} z*{%p9wo08Pr-sQ|&(yf894gL61}Tpgx)Ee&kr`oW!<1Rh_U$?$$v1hnzRr$qc-Xdk z`gBs-@j+;2@E0Z}`u3g1>(L)ixmOx=Bl+zqclk4>B4i7yDDt#))`VUkc@huYr<;Mv z1{HntW@9bcv7~uBR+gPvIJ#(XtIfXdCieY5B#|)UE}Um*79M-@Q%X@O#a27flF;0R zKGD5=g{LPONRI$>&%;%B=BKKXl84C2>Q3}8;x1oXC~vy|-zN8Rkes#mE!(a*qB?XQ zSzKI(bc;UKIO!J7CWDsUCH6P@+~p6spSOADwkOF7bM@Ha!xi>gA}UI89eT`9U%!-2 adHuqCxXkpUlx07^g3(K6!Fk9(Z~g}WQFOlm delta 595 zcmZ9Ju}TC%42Czmr|wQ87IKZnfylvC$;{-YJjKGw%0kpi)WTXUPgX=MVj&1Fg708C z58>1J1UiT}8!i6o%b)!GY2PMoJ9&CsbI3keE)aubKPvF~6wdDeA^^x?kI7FR{^AHn zAgh{r-?K}QPBZIm_CYCInh`G81B}b0Dru0kl(d|*5@B4+Ppi4`CUK`=U{O!|)zR$Ul TO8Fdf@4NlS(!sp*-h9>H$moQ;