resolving conficts ottos-mops root/branches/BioVeL/ottos-mops
-rw-r--r-- 4152 .gitattributes
drwxr-xr-x - DataCleaning
-rw-r--r-- 794 README.md
-rw-r--r-- 20 anotherfile.txt