whoops, the conflicts plugin takes care of this too 0.19
-rw-r--r-- .gitignore
-rw-r--r-- Changes
-rw-r--r-- dist.ini
drwxr-xr-x inc
drwxr-xr-x lib
drwxr-xr-x t
-rw-r--r-- weaver.ini