git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 69ed906)
JAL-3066 remove git conflict file spike/jims/Release_2_12_alpha
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 29 Nov 2022 17:05:07 +0000 (17:05 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 29 Nov 2022 17:05:07 +0000 (17:05 +0000)
swingjs/ver/3.3.1/timestamp.orig [deleted file] patch | blob | history

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