Resolve merge conflict by removing workspace.json

vault backup: 2026-08-11 03:00:35
2026-08-11 03:11:33 +04:00 · 2026-08-11 03:00:35 +04:00
3 changed files with 3 additions and 1 deletions
@@ -28,5 +28,6 @@
  "file-recovery": true,
  "publish": false,
  "sync": true,
-  "bases": true
+  "bases": true,
  "webviewer": false
 }
@@ -0,0 +1 @@
 this is a new file created in desctop
Author	SHA1	Message	Date
mbozoyan	5cdb0d437d	Resolve merge conflict by removing workspace.json	2026-08-11 03:11:33 +04:00
mbozoyan	b9ef5700d6	vault backup: 2026-08-11 03:00:35	2026-08-11 03:00:35 +04:00