From 9124f98becff94882352a2797de3099ad29fd956 Mon Sep 17 00:00:00 2001
From: stoyan <stoyan@72102866-910b-0410-8b05-ffd578937521>
Date: Sun, 9 Sep 2012 21:33:27 +0000
Subject: [PATCH] Fix conflict

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35549 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 327f60e2f..b8a524479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-09-10  Sergii Stoian <stoyan255@gmail.com>
 
+        * Source/NSFileManager.m:
+        [createDirectoryAtPath:withIntermediateDirectories:attributes:error:]:
+        Create directories only if it doesn't exist.
+
+2012-09-09  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
 	* Source/NSFileManager.m:
 	[createDirectoryAtPath:withIntermediateDirectories:attributes:error:]:
 	Create directories only if it doesn't exist.