From 440c7eb4b30ebeb27976e512d5c95f13429e3453 Mon Sep 17 00:00:00 2001
From: Lars Hvam <larshp@hotmail.com>
Date: Sun, 27 May 2018 17:06:58 +0200
Subject: [PATCH] v1.68.0

---
 changelog.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index c0afbe858..210aeaf70 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -8,6 +8,12 @@ Legend
 + : added
 - : removed
 
+2018-05-27 v1.68.0
+------------------
++ Resolve conflicts functionallity/UI (beta)
++ Annotated tags
+* Locking problems fixed(?)
+
 2018-05-19 v1.67.0
 ------------------
 + IDOC support