Resolved minor conflict.
treee4fdc24a12373c72d6d77d44c72d338dd68dff69
-rw-r--r-- 1810 build.xml
drwxr-xr-x - lib
drwxr-xr-x - maps
drwxr-xr-x - rapport
drwxr-xr-x - src
drwxr-xr-x - test