git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixes JTabbedPane missing labels; color chooser e.g.
[jalview.git] / swingjs / timestamp
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 3986ece..d96d5a7 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181117143423 
-=======
-20181117133636 
->>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
+20181217163947