DennisOSRM/Project-OSRM — comment on commit 295164302a4e3315895af3d2a79e5b67aed65c9c
File: createHierarchy.cpp line 42
By emiltin:

did you forget to resolve this conflict?