Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Position: maintain altitude #47

Merged
merged 23 commits into from
Dec 14, 2018
Merged

Conversation

macgyver912
Copy link
Contributor

Segunda parte que contendría el Issue #29 y Merge #34.

…caracteres. Se ha corregido warnings de extra ';' en namespace de Position.h y Position.cpp.
…s a dos decimales y se distingue como 'Waypoint' aquellas Position con nombre.
…caracteres. Se ha corregido warnings de extra ';' en namespace de Position.h y Position.cpp.
…s a dos decimales y se distingue como 'Waypoint' aquellas Position con nombre.
@fmrico
Copy link
Owner

fmrico commented Dec 13, 2018

Hola @macgyver912 ,

Parece que este PR tiene conflictos, probablemente con el PR que te acabo de aceptar.

Haz un rebase, probablemente con git pull --rebase upstream master.

@macgyver912
Copy link
Contributor Author

Hola @macgyver912 ,

Parece que este PR tiene conflictos, probablemente con el PR que te acabo de aceptar.

Haz un rebase, probablemente con git pull --rebase upstream master.

Hecho. A ver si con esto ya está listo.

@fmrico fmrico merged commit 66aac22 into fmrico:master Dec 14, 2018
@fmrico
Copy link
Owner

fmrico commented Dec 14, 2018

Merged!!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants