ddragosd commented on issue #77: Fixes a few linux issues with the makefile URL: https://github.com/apache/incubator-openwhisk-devtools/pull/77#issuecomment-356011688 @mcdan I tried to solve the conflict with the `master` branch and keep the changes in this branch but it still asks to _resolve conflict_ . Mind merging in your branch and push again ?
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
