JAL-2136 merged and resolved conflicts with 80edaa84d6d9beac9f0d2c71b50b7b56fd393427
[jalview.git] / nbproject /
drwxr-xr-x   ..
-rw-r--r-- 1455 genfiles.properties
-rw-r--r-- 5970 project.properties
-rw-r--r-- 1294 project.xml