diff options
| author | erik <erik@8d8ab74c-27aa-4a3d-9bde-523a2bc1f624> | 2009-01-30 21:16:19 +0000 |
|---|---|---|
| committer | erik <erik@8d8ab74c-27aa-4a3d-9bde-523a2bc1f624> | 2009-01-30 21:16:19 +0000 |
| commit | 59fbb88ae697522b4ed75c85ba6e547bf2a053aa (patch) | |
| tree | 9852095e924962ac5b0b8c16ae9967402f597758 | |
| parent | e0b1c9738fa1f74e35cefab17ce9207d85ddfdcb (diff) | |
Fixed broken commit left from svn conflict
git-svn-id: https://dedected.org/svn/trunk@58 8d8ab74c-27aa-4a3d-9bde-523a2bc1f624
| -rw-r--r-- | com-on-air_cs-linux/tools/dectshark/gui.cpp | 4 |
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); |