From 947307af0c934f58c6281d2ef72e003efe6bb268 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 24 Sep 2018 16:34:46 -0400
Subject: [PATCH] Remove something left by temporary conflict.

---
 lib/77bit/packjt77.f90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90
index e5c609f5c..24d41ec04 100644
--- a/lib/77bit/packjt77.f90
+++ b/lib/77bit/packjt77.f90
@@ -1200,7 +1200,7 @@ subroutine mp_short_ops(w,u)
   
   return
 end subroutine mp_short_ops
-=======
+
 subroutine add_call_to_recent_calls(callsign)
 
   character*13 callsign