summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--com-on-air_cs-linux/tools/dectshark/gui.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/com-on-air_cs-linux/tools/dectshark/gui.cpp b/com-on-air_cs-linux/tools/dectshark/gui.cpp
index 9355155..898650f 100644
--- a/com-on-air_cs-linux/tools/dectshark/gui.cpp
+++ b/com-on-air_cs-linux/tools/dectshark/gui.cpp
@@ -157,11 +157,7 @@ void print_gui::InitCurses()
mvwprintw(mainwin,1,1,"RFPI");
mvwprintw(mainwin,1,13,"Ch");
mvwprintw(mainwin,1,31,"FP-Pkt");
-<<<<<<< .mine
mvwprintw(mainwin,1,53,"RSSI");
-=======
- mvwprintw(mainwin,1,51,"RSSI");
->>>>>>> .r49
wnoutrefresh(mainwin);
box(statuswin,0,0);