Fix conflict

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35549 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
stoyan 2012-09-09 21:33:27 +00:00
parent 064c5554f2
commit 9124f98bec

View file

@ -4,6 +4,12 @@
[createDirectoryAtPath:withIntermediateDirectories:attributes:error:]: [createDirectoryAtPath:withIntermediateDirectories:attributes:error:]:
Create directories only if it doesn't exist. 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.
2012-09-06 Richard Frith-Macdonald <rfm@gnu.org> 2012-09-06 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPropertyList.m: * Source/NSPropertyList.m: