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

diff --git a/swingjs/timestamp b/swingjs/timestamp
index 170a61e..81a6aeb 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)
+20181213165944