-<<<<<<< Upstream, based on branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
-20181030183630
-=======
-20181101060953
->>>>>>> 8398157 JAXB upgrade for package-info namespace (only)
+20181101060953
\ No newline at end of file