1 files changed, 9 insertions, 3 deletions
diff --git a/gr-digital/python/__init__.py b/gr-digital/python/__init__.py
index 3d0be3865b..b8060140e4 100644
--- a/gr-digital/python/__init__.py
+++ b/gr-digital/python/__init__.py
@@ -22,11 +22,17 @@
 # The presence of this file turns this directory into a Python package
 
 from digital_swig import *
-from dbpsk import *
-from dqpsk import *
-from d8psk import *
 from psk2 import *
+from bpsk import *
+from qpsk import *
 from qam import *
+<<<<<<< HEAD
+from gmsk import *
+from pkt import *
+from packet_utils import *
+from crc import *
+=======
 from ofdm import *
 from pkt import *
 from modulation_utils2 import *
+>>>>>>> next