/components/conflict/ s11-update
drwxr-xr-x [up]
-rw-r--r-- 2013-10-24 11:32 +0200 2270 Makefile
-rw-r--r-- 2013-10-24 11:32 +0200 1021 conflict.copyright
-rw-r--r-- 2013-10-24 11:32 +0200 1850 conflict.p5m
-rw-r--r-- 2013-10-24 11:32 +0200 15 resolve.deps