X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Ftimestamp;h=e9e8e93ded796ea25e3e817a93cf7f82d0b5e7da;hb=01370df957cf0097e3a063ed84d7a0bbcc2ff789;hp=170a61e73f320e54209b9160260eb82275fdaae8;hpb=5327042013f9d3b51c3f15e5f567e7bb11e32dfe;p=jalview.git

diff --git a/swingjs/timestamp b/swingjs/timestamp
index 170a61e..e9e8e93 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< 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)
+20181125233621