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

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

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 987104fce..7fffa005b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,7 @@
 # Version 0.5.0
 - 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.
+- [#508] Settings saved to INI files in different folders.
 - [#193] Undeletable zombie arc objects.
 - New feature. Groups.
 - Tool "Curve intersect axis" store data about subpaths.