From 44a15b37a4b37196b8d6f67d6097a103712ecde0 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sun, 20 Apr 2014 11:36:07 +0100
Subject: [PATCH] Update News.txt

---
 News.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/News.txt b/News.txt
index 9b286f2c..92fce7ad 100755
--- a/News.txt
+++ b/News.txt
@@ -1,4 +1,4 @@
-1.4.0 for Linux, Mac and Windows (???):
+1.4.0 for Linux, Mac and Windows (Sun Apr 20, 2014):
 
      Hylke:
      - Check user's local bin folders for git binary
@@ -8,6 +8,7 @@
      - Fix some conflict resolution issues by merging instead of rebasing on the remote
      - Fix crash when copying to clipboard on Windows
      - Sync more quickly after the system wakes up from sleep
+     - Fix conflict resolution when renaming folders
 
 
 1.3.0 for Linux (Sat Oct 26 2013):