Fixed "conflict".
tree09a55e932108f52989bd3e5a6c038dabfdf7e6c1
-rw-r--r-- 1865 build.xml
drwxr-xr-x - lib
drwxr-xr-x - maps
drwxr-xr-x - rapport
drwxr-xr-x - src
drwxr-xr-x - test