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.2

Browse Source 
19de0ffd80..9071f79661
This commit is contained in:
Joplin Bot 2021-08-31 13:00:19 +00:00
parent 1e11d9d50a
commit 9ac04bddc1
No known key found for this signature in database
GPG Key ID: B9E410D53EF34309
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests.json
View File

@ -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": {

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

@ -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"
}

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

Binary file not shown.