From 97a61f16c3e2585df9616863a4d366de9db7d369 Mon Sep 17 00:00:00 2001
From: BojanKverh <bojan.kverh@gmail.com>
Date: Fri, 10 Jun 2016 22:26:06 +0200
Subject: [PATCH] Trying to resolve conflict

--HG--
branch : feature
---
 ChangeLog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index c440305bb..987104fce 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,5 @@
 # Version 0.5.0
-- [#479] Preferences dialog size is now saved between the sessions in Valentina and Tape app
+- Size of preferences dialog in both Valentina and Tape app is now preserved between sessions
 - [#479] Preferences dialog is now extendable and when it is opened again, it will be resized to its previous size.
 - [#193] Undeletable zombie arc objects.
 - New feature. Groups.