Delete trailing whitespace, extra newlines, to quiet git hooks and add an extra = so that it does not appear to git as a merge conflict marker.

This commit is contained in:
mcsauder
2019-04-02 11:26:57 -06:00
committed by Daniel Agar
parent 1250fb1b48
commit e6f1a2db12
5 changed files with 7 additions and 8 deletions

View File

@@ -15,7 +15,7 @@ CONFIG:
short: px4_sitl (Address Sanitizer)
buildType: AddressSanitizer
settings:
CONFIG: px4_sitl_default
CONFIG: px4_sitl_default
px4_fmu-v2_default:
short: px4_fmu-v2
buildType: MinSizeRel