You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
6 lines
334 B
6 lines
334 B
From https://code.google.com/p/ardupilot-mega |
|
28bb6fd..c5f0dc1 APM_Camera -> origin/APM_Camera |
|
8905f63..112b274 master -> origin/master |
|
error: Your local changes to 'ArduPlane/APM_Config.h' would be overwritten by merge. Aborting. |
|
Please, commit your changes or stash them before you can merge. |
|
Updating 8905f63..112b274
|
|
|