From c88c939cd94c72e3e9edd946aff2992bf7bcfc64 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Fri, 29 Jul 2022 09:42:22 +0900
Subject: [PATCH] bumped

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

diff --git a/manifest.json b/manifest.json
index 13fb233..5d67e1a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "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 823eb63..a125c20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.13.0",
+            "version": "0.13.1",
             "license": "MIT",
             "dependencies": {
                 "diff-match-patch": "^1.0.5",
diff --git a/package.json b/package.json
index fef3c3a..2dabfd5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "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 bcf5cbf..08f678d 100644
--- a/updates.md
+++ b/updates.md
@@ -5,4 +5,7 @@
 - We can see the history of deleted files.
 - `Pick file to show` was renamed to `Pick a file to show.
 - Files in the `Pick a file to show` are now ordered by their modified date descent.
-- Update information became to be shown on the major upgrade.
\ No newline at end of file
+- Update information became to be shown on the major upgrade.
+
+#### Minors
+- 0.13.1 Fixed on conflict resolution.
\ No newline at end of file