fix conflicts field 0.1-1
[grml-desktop.git] / etc /
drwxr-xr-x   ..
drwxr-xr-x - skel