[49/50] [abbrv] tinkerpop git commit: Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4

2016-09-19 Thread pieter
Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4 Somehow, the "windows" profile wasn't removed in that conflict. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/54ed33df Tree:

tinkerpop git commit: Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4

2016-09-19 Thread spmallette
Repository: tinkerpop Updated Branches: refs/heads/master 4293eb333 -> 54ed33df5 Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4 Somehow, the "windows" profile wasn't removed in that conflict. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: