X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Ftimestamp;h=568c1b9c5020262579c9fa8770e94d18e9634884;hb=c1d91659929c9b62a72bf720f0c2c1314b6c0bb2;hp=3986ecef9aab9b307191b0684f2170b7a8dcef73;hpb=92de0afb8f650e19b64cbddfa8c32b1119737a8b;p=jalview.git diff --git a/swingjs/timestamp b/swingjs/timestamp index 3986ece..568c1b9 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1,5 +1 @@ -<<<<<<< HEAD -20181117143423 -======= -20181117133636 ->>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git +20190110222432