Remove merge guff.

pull/164/head
Mark Jessop 2019-03-27 22:37:01 +10:30
rodzic dc1560359f
commit 946ad0ec4c
1 zmienionych plików z 0 dodań i 2 usunięć

Wyświetl plik

@ -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