From 946ad0ec4cf94c7fbd7d842b8944e820d323ce92 Mon Sep 17 00:00:00 2001
From: Mark Jessop <vk5qi@rfhead.net>
Date: Wed, 27 Mar 2019 22:37:01 +1030
Subject: [PATCH] Remove merge guff.

---
 auto_rx/autorx/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/auto_rx/autorx/__init__.py b/auto_rx/autorx/__init__.py
index 747910d..aeaff67 100644
--- a/auto_rx/autorx/__init__.py
+++ b/auto_rx/autorx/__init__.py
@@ -14,8 +14,6 @@
 __version__ = "1.1.0.2-experimental"
 
 
->>>>>>> testing
-
 # Global Variables
 
 # RTLSDR Usage Register - This dictionary holds information about each SDR and its currently running Decoder / Scanner