Github/plugins
1
0
Fork 0
mirror of synced 2024-07-05 03:58:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update: joplin-plugin-conflict-resolution@1.2.1

Browse Source 
2af3996ba3..8703fe0d8e
This commit is contained in:
Joplin Bot 2021-08-05 22:00:20 +00:00
parent 6edabb3179
commit 9d1e3e3284
No known key found for this signature in database
GPG Key ID: B9E410D53EF34309
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.5.0 | Use locally stored BibTeX files to integrate citation into Joplin | Abdallah Ahmed
[🏠](https://github.com/JackGruber/joplin-plugin-combine-notes) | Combine notes | 1.0.1 | Combine one or more notes | JackGruber
[🏠](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204) | Conflict Resolution | 1.2.0 | A plugin that makes process of resolving conflicts easier. | Ahmed Alwasifey
[🏠](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204) | Conflict Resolution | 1.2.1 | 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

6
manifests.json
View File

@ -731,15 +731,15 @@
"manifest_version": 1,
"id": "joplin-plugin-conflict-resolution",
"app_min_version": "2.0.9",
"version": "1.2.0",
"version": "1.2.1",
"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:6b4dbdc6ca2d4308d8b9fdd178eb4831bd9fff1c2a87f767678f4e592dc4b32c",
"_publish_commit": "master:2af3996ba36adbd5b5e94a9f213700fb0c6a958c",
"_publish_hash": "sha256:7e5a07dcab27c6c081c9ff75170e6ed8861a43c5be025ca901ad1dc69dcbeee9",
"_publish_commit": "master:8703fe0d8ec329635d683dc48eac74f848e63696",
"_npm_package_name": "joplin-plugin-conflict-resolution"
},
"com.gitlab.BeatLink.joplin-plugin-repeating-todos": {

6
plugins/joplin-plugin-conflict-resolution/manifest.json
View File

@ -2,14 +2,14 @@
"manifest_version": 1,
"id": "joplin-plugin-conflict-resolution",
"app_min_version": "2.0.9",
"version": "1.2.0",
"version": "1.2.1",
"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:6b4dbdc6ca2d4308d8b9fdd178eb4831bd9fff1c2a87f767678f4e592dc4b32c",
"_publish_commit": "master:2af3996ba36adbd5b5e94a9f213700fb0c6a958c",
"_publish_hash": "sha256:7e5a07dcab27c6c081c9ff75170e6ed8861a43c5be025ca901ad1dc69dcbeee9",
"_publish_commit": "master:8703fe0d8ec329635d683dc48eac74f848e63696",
"_npm_package_name": "joplin-plugin-conflict-resolution"
}

BIN
plugins/joplin-plugin-conflict-resolution/plugin.jpl
View File

Binary file not shown.