From b42152db5e6a1f377b57bd00aea72cdccfac9292 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Mon, 1 Sep 2025 12:28:01 +0900
Subject: [PATCH] bump

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

diff --git a/manifest.json b/manifest.json
index 15c9651..1b84535 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.25.12",
+    "version": "0.25.13",
     "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.json b/package.json
index 4439507..4d6c39a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.25.12",
+    "version": "0.25.13",
     "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 fe9f45d..f2b1e04 100644
--- a/updates.md
+++ b/updates.md
@@ -1,3 +1,10 @@
+## 0.25.13
+
+1st September, 2025
+
+### Fixed
+- Conflict resolving dialogue now properly displays the changeset name instead of A or B (#691).
+
 ## 0.25.12
 
 29th August, 2025