Merge branch 'fix-merge2' into next

2018-12-10 18:13:01 +01:00 · 2018-12-10 18:13:01 +01:00 · 31b471a0ce
parent 0dc07362ed 7c9f824e29
commit 31b471a0ce
2 changed files with 1 additions and 1 deletions
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@ -33,6 +33,7 @@
 */

 #include "MATH_CONSTANTS.h"
+#include "acquisition_msg_rx.h"
 #include "concurrent_map.h"
 #include "concurrent_queue.h"
 #include "control_thread.h"
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
@ -30,7 +30,6 @@
 * -------------------------------------------------------------------------
 */

-
 #include "GPS_L1_CA.h"
 #include "GPS_L2C.h"
 #include "GPS_L5.h"