From: Jim Procter Date: Tue, 29 Nov 2022 17:05:07 +0000 (+0000) Subject: JAL-3066 remove git conflict file X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f39d94943f685a971381d76c2f24323dd2f963c6;p=jalview.git JAL-3066 remove git conflict file --- diff --git a/swingjs/ver/3.3.1/timestamp.orig b/swingjs/ver/3.3.1/timestamp.orig deleted file mode 100644 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