From 59fbb88ae697522b4ed75c85ba6e547bf2a053aa Mon Sep 17 00:00:00 2001 From: erik Date: Fri, 30 Jan 2009 21:16:19 +0000 Subject: Fixed broken commit left from svn conflict git-svn-id: https://dedected.org/svn/trunk@58 8d8ab74c-27aa-4a3d-9bde-523a2bc1f624 --- com-on-air_cs-linux/tools/dectshark/gui.cpp | 4 ---- 1 file changed, 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); -- cgit v1.2.3