From d2b3e078d53f7e357aeaf41bd4bb8e894b416b14 Mon Sep 17 00:00:00 2001
From: Sven Neuhaus <neuhaus@users.noreply.github.com>
Date: Thu, 22 Feb 2018 13:05:00 +0100
Subject: [PATCH] updated version to resolve conflict

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f8fec3fd7..484bd77cf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "chainpad-server": "^2.0.0",