Bumped and documented.

docs/settings.md

@@ -47,7 +47,7 @@ If you are an early adopter, maybe this value is left as 30 seconds. Please chan
 ### Manual Garbage Collect
 Run "Garbage Collection" manually.
 
-### End to End Encryption (beta)
+### End to End Encryption
 Encrypt your database. It affects only the database, your files are left as plain.
 
 The encryption algorithm is AES-GCM.
@@ -119,6 +119,9 @@ If this option is enabled, move deleted files into the trash instead delete actu
 ### Do not delete empty folder
 Self-hosted LiveSync will delete the folder when the folder becomes empty. If this option is enabled, leave it as an empty folder.
 
+### Use newer file if conflicted (beta)
+Always use the newer file to resolve and overwrite when conflict has occurred.
+
 ### minimum chunk size and LongLine threshold
 The configuration of chunk splitting.
 

docs/settings_ja.md

@@ -49,7 +49,7 @@ Obsidianでのファイル操作が終わってから指定秒数が経過した
 ### Manual Garbage Collect
 上記のGarbage Collectionを手動で行います。
 
-### End to End Encryption (beta)
+### End to End Encryption
 データベースを暗号化します。この効果はデータベースに格納されるデータに限られ、ディスク上のファイルは平文のままです。  
 暗号化はAES-GCMを使用して行っています。
 
@@ -121,6 +121,9 @@ LiveSyncをONにするか、もしくはPeriodic Sync + Sync On File Openがオ
 Self-hosted LiveSyncは通常、フォルダ内のファイルがすべて削除された場合、フォルダを削除します。  
 備考:Self-hosted LiveSyncの同期対象はファイルです。
 
+### Use newer file if conflicted (beta)
+競合が発生したとき、常に新しいファイルを使用して競合を自動的に解決します。
+
 ### minimum chunk size と LongLine threshold
 チャンクの分割についての設定です。  
 Self-hosted LiveSyncは一つのチャンクのサイズを最低minimum chunk size文字確保した上で、できるだけ効率的に同期できるよう、ノートを分割してチャンクを作成します。  

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.1.17",
+    "version": "0.1.18",
     "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",

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.1.16",
+    "version": "0.1.18",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.1.16",
+            "version": "0.1.18",
             "license": "MIT",
             "dependencies": {
                 "diff-match-patch": "^1.0.5",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.1.16",
+    "version": "0.1.18",
     "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",
     "scripts": {