From f5e28b5e1c32c11fcb59011cd2da343cf95c8b15 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Wed, 21 Dec 2022 14:51:59 +0900
Subject: [PATCH] bump

---
 manifest.json     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 updates.md        | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4c795f4..f80b5bb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.17.2",
+    "version": "0.17.3",
     "minAppVersion": "0.9.12",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",
diff --git a/package-lock.json b/package-lock.json
index 232aace..d1bc31b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.17.2",
+    "version": "0.17.3",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.17.2",
+            "version": "0.17.3",
             "license": "MIT",
             "dependencies": {
                 "diff-match-patch": "^1.0.5",
diff --git a/package.json b/package.json
index 6a7ec19..1e5d73a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.17.2",
+    "version": "0.17.3",
     "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "main": "main.js",
     "type": "module",
diff --git a/updates.md b/updates.md
index 7df4b40..7c21712 100644
--- a/updates.md
+++ b/updates.md
@@ -20,6 +20,9 @@
   - Fixed
     - Writing to the storage will be pended while they have conflicts after replication.
 
+- 0.17.3
+  - Now we supported canvas! And conflicted JSON files are also synchronised with merging its content if they are obvious.
+
 ### 0.16.0
 - Now hidden files need not be scanned. Changes will be detected automatically.
   - If you want it to back to its previous behaviour, please disable `Monitor changes to internal files`.