[2/4] incubator-ignite git commit: # IGNITE-283: Fixed conflict resolution.

# IGNITE-283: Fixed conflict resolution. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45ce8147 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45ce8147 Diff: http://git-wip-us.apache

[2/4] incubator-ignite git commit: # IGNITE-283: Fixed conflict resolution.

# IGNITE-283: Fixed conflict resolution. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45ce8147 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45ce8147 Diff: http://git-wip-us.apache