rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

OP-1840 another merge conflict

Browse Source
This commit is contained in:
Cliff Geerdes 2015-05-05 23:26:08 -04:00
parent d9ab9e4f27
commit 193911ba20
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/modules/GPS/GPS.c
View File

@ -157,10 +157,6 @@ int32_t GPSStart(void)
int32_t GPSInitialize(void) int32_t GPSInitialize(void)
{ {
gpsPort = PIOS_COM_GPS; gpsPort = PIOS_COM_GPS;
<<<<<<< HEAD
=======
GPSSettingsDataProtocolOptions gpsProtocol;
>>>>>>> next
HwSettingsInitialize(); HwSettingsInitialize();
#ifdef MODULE_GPS_BUILTIN #ifdef MODULE_GPS_BUILTIN