removed leftover of merge process

diff --git a/ext.c b/ext.c
index 2453f51ba799c58712beb8bb9c27ff84d41f36a3..b1d115e1cc51020f983db8af8f98e4f75dba657e 100644 (file)
--- a/ext.c
+++ b/ext.c
@@ -601,6 +601,4 @@ int ext_set_rf_gain(void *data) {
   }
   set_rf_gain(active_receiver->id,value);
   return 0;
->>>>>>> baa20fb6e81527751cd7e97f910c6c56880d6898
 }
-