Skip to content

Q
qgroundcontrol
Commit 3b059a31 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Screwed up merge cleanup

parent 44cf6861
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
qgroundcontrol.pro
View file @ 3b059a31
......@@ -752,11 +752,8 @@ CONFIG(debug, debug|release) {
src/qgcunittest/MockUASManager.h \
src/qgcunittest/MockUAS.h \
src/qgcunittest/MockQGCUASParamManager.h \
<<<<<<< HEAD
src/qgcunittest/MultiSignalSpy.h \
src/qgcunittest/TCPLinkTest.h \
=======
>>>>>>> b90a0e96162e58cc5c6f5f5d2e285145cdd75f42
src/qgcunittest/FlightModeConfigTest.h
SOURCES += \
......@@ -764,11 +761,8 @@ CONFIG(debug, debug|release) {
src/qgcunittest/MockUASManager.cc \
src/qgcunittest/MockUAS.cc \
src/qgcunittest/MockQGCUASParamManager.cc \
<<<<<<< HEAD
src/qgcunittest/MultiSignalSpy.cc \
src/qgcunittest/TCPLinkTest.cc \
=======
>>>>>>> b90a0e96162e58cc5c6f5f5d2e285145cdd75f42
src/qgcunittest/FlightModeConfigTest.cc
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment