X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Ftimestamp;h=568c1b9c5020262579c9fa8770e94d18e9634884;hb=c1d91659929c9b62a72bf720f0c2c1314b6c0bb2;hp=eff8cd00f69487e80ec78c6967fe2aa0191dd5a9;hpb=a5af7a36aa6a66935d94ae84c3259db4593de592;p=jalview.git diff --git a/swingjs/timestamp b/swingjs/timestamp index eff8cd0..568c1b9 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1,5 +1 @@ -<<<<<<< HEAD -20180821132825 -======= -20180821131949 ->>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git +20190110222432