git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-3066 remove git conflict file
[jalview.git] / swingjs / ver / 3.3.1 / timestamp.orig
diff --git a/swingjs/ver/3.3.1/timestamp.orig b/swingjs/ver/3.3.1/timestamp.orig
deleted file mode 100644 (file)
index e7fc551..0000000
--- a/swingjs/ver/3.3.1/timestamp.orig
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-20210728172208 
-=======
-20210720163506 
->>>>>>> JAL-3878_web_services_overhaul