From d2325ebde939518e8b0542f8f26982a3e39be51b Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 2 Aug 2006 02:07:47 +0000
Subject: [PATCH] Dummy

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@224 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 wsjt.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wsjt.py b/wsjt.py
index a18e1b7fc..b9769853d 100644
--- a/wsjt.py
+++ b/wsjt.py
@@ -1,4 +1,8 @@
+<<<<<<< .mine
+#------------------------------------------------------------------- WSJT
+=======
 #----------------------------------------------------------------- WSJT
+>>>>>>> .r223
 from Tkinter import *
 from tkFileDialog import *
 import Pmw