true conflict\!
[jalviewjs.git] / .project
2015-07-23 gmungocJAL-1807 Bob's JalviewJS prototype first commit