From 2a7f82a01ce98937f7cd6b5859f3be252e6b9c74 Mon Sep 17 00:00:00 2001
From: Nathan <nathan.matsuda@gmail.com>
Date: Mon, 11 Sep 2017 17:48:38 -0500
Subject: [PATCH] finished merging

Former-commit-id: a6b0822840034687ea37ab6088a55b149a47cff3
---
 dump1090/interactive.c           |  11 -----------
 dump1090/interactive.o           | Bin 25084 -> 25076 bytes
 dump1090/view1090.REMOVED.git-id |   2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/dump1090/interactive.c b/dump1090/interactive.c
index 2872080..2a7db58 100644
--- a/dump1090/interactive.c
+++ b/dump1090/interactive.c
@@ -572,7 +572,6 @@ void interactiveShowData(void) {
                         printf("\n ");
                     }
 
-<<<<<<< HEAD
                     if ((now - a->seen) > 30 ) {
                         printf("\x1B[1;30m%-8s%5s %4s %5s  %c%c %d",
                             a->flight, 
@@ -590,16 +589,6 @@ void interactiveShowData(void) {
                             cLat, cLon,
                             (int)((float)signalAverage/25.0f));
                     }
-=======
-                    printf("\x1B[1;31m%-8s\x1B[1;32m%5s \x1B[1;33m%4s \x1B[1;34m%5s  \x1B[1;36m%c%c \x1B[1;35m%d",
-                        a->flight, 
-                        strFl, 
-                        strGs,
-                        strD, 
-                        cLat, cLon,
-                        (int)((float)signalAverage/25.0f));
-
->>>>>>> 474b6b928fbf41ebad522ee55fae952c481aabf5
 
                     if(d<5) {
                      printf("%ls",L"\x1B[1;37m│\n└──────────────────────────────┘");
diff --git a/dump1090/interactive.o b/dump1090/interactive.o
index 3eb74d5faf5bcfcfb6ae5ec93524b48ebc41b38d..6fdd68c0f5806eb4667edccec9007c68f5283c42 100644
GIT binary patch
delta 493
zcmex!nDNVD#t9CB+XEQDK!F`XZ=V?G&v;|wLVZTYfXNpb{TVYRD>AtYHV8wcCvZdP
z1(Pe8>;(nnA-r%72yHO=Bv3S69l|SNg3#@gC7JCdZ)-w${vr_iw*iDsm|VzgE~sS(
z;RP^4Xs^jTne7Fu>>)g;Aj7Q5oGkW&)lktDP~q8=BY~pIju5pf5Q@Qh@=BnnJDO<v
z<exy%Y^W#`3q*1EWKULm!CY5V6M84lWVM%^0Tp$C+P1@ofq@yQ@WSMetmZ;D+#q@m
zKxKdUPPSsRlbqoJ5tfGr%npADUt#h@HhoTwSOx}Fpg_gulWg96j7ukrimqX_-h4>(
z6Vv3)5-pQ0BsWZcBe`Mo0;vXLMvlpfe(H=5CVK+OiphmQ^1|eqK+<FKK_Hnh`6ZCl
im@Me84va5Le|^RSlQV&2!{(X(>v<V(Z1#-Z%mM&G7GKQ(

delta 501
zcmZ9IKS)AB9LMkX-qVsOc$MI_Xi!)*m^By<J{>B<@T{d89NKEKsGv5<r7a&ng4*oQ
zU=Wl%f}E6Ga%^*GFj`uRmY|`l-z{~+_rv#dzq^C`XuwwkigB}+VZSTTL9E#e0@{_+
z5P-l(5U_!R+N^odN880NVj1@|%k=rFEp-y7uqkaWNNrmq9wOH*{xV8U^b_?kaSb>1
zh&d6XmI2}-R&~qVx2P$}&d_66W<lAq(&xA$?O1|lhX^c%m(q%VHiw_mZYir7G>kas
zvdo?7zc(D=iOb?8W#j6#`aEO09Bkp6E7IGZp)+;0%hDKi$9O48+OIyQE~t;7?GAay
zvy2T(k$0NzR1aLB*Lwv~=id9S;jOQL5njPOH}I9;{Lncb$WH=8o(@6_6EZh&UFHMY
jGUHg4xs1;;1LzS!NMcxo;0{-1?mD)(?uI8Pk#&r3S)E{|

diff --git a/dump1090/view1090.REMOVED.git-id b/dump1090/view1090.REMOVED.git-id
index 477777b..cd5a2a1 100644
--- a/dump1090/view1090.REMOVED.git-id
+++ b/dump1090/view1090.REMOVED.git-id
@@ -1 +1 @@
-f8df326f25fd1b7dcebda663d33f6c93ea268776
\ No newline at end of file
+18958032218e1a8e0ef5b79733e5e4b9dd540f61
\ No newline at end of file