Resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/283215f9 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/283215f9 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/283215f9 Branch: refs/heads/feature/GEODE-2632-17 Commit: 283215f9f348918cec2b85e97eb2aec977f10492 Parents: 91c13da Author: Kirk Lund <[email protected]> Authored: Tue May 30 10:41:29 2017 -0700 Committer: Kirk Lund <[email protected]> Committed: Tue May 30 10:41:29 2017 -0700 ---------------------------------------------------------------------- .../sanctionedDataSerializables.txt | 1074 +++++++++--------- 1 file changed, 535 insertions(+), 539 deletions(-) ----------------------------------------------------------------------
