From c7db8592c6756e4e572bd8862a8bc040c6563cb6 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Mon, 26 Dec 2022 16:16:46 +0900
Subject: [PATCH] bump

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

diff --git a/manifest.json b/manifest.json
index 2e36542..3b046b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.17.6",
+    "version": "0.17.7",
     "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 8c52cc5..886928e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.17.6",
+    "version": "0.17.7",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.17.6",
+            "version": "0.17.7",
             "license": "MIT",
             "dependencies": {
                 "diff-match-patch": "^1.0.5",
diff --git a/package.json b/package.json
index 1c92460..427906d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.17.6",
+    "version": "0.17.7",
     "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 2889491..f1fc157 100644
--- a/updates.md
+++ b/updates.md
@@ -29,6 +29,12 @@
 - 0.17.5 Now `read chunks online` had been fixed, and a new feature: `Use dynamic iteration count` to reduce the load on encryption/decryption.
   Note: `Use dynamic iteration count` is not compatible with earlier versions.
 - 0.17.6 Now our renamed/deleted files have been surely deleted again.
+- 0.17.7
+  - Fixed:
+    - Fixed merging issues.
+    - Fixed button styling.
+  - Changed:
+    - Conflict checking on synchronising has been enabled for every note in default.
 
 ### 0.16.0
 - Now hidden files need not be scanned. Changes will be detected automatically.