DennisOSRM/Project-OSRM — comment on commit b210b229757583116035f7e37d2193c278df70d7
File:  line 0
By emiltin:

thanks. i resolved conflicts manually and pushed my master branch to github.
github is powerful, but can be complicted. i'm still learning too :-)