From f39d94943f685a971381d76c2f24323dd2f963c6 Mon Sep 17 00:00:00 2001
From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 29 Nov 2022 17:05:07 +0000
Subject: [PATCH] JAL-3066 remove git conflict file

---
 swingjs/ver/3.3.1/timestamp.orig |    5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 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
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
-- 
1.7.10.2