Mt erge branch 'S2GRAPH-192' * S2GRAPH-192: fix name conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/e8b62025 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/e8b62025 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/e8b62025 Branch: refs/heads/master Commit: e8b620259308cccae198b9cd3fd82aa3878a2b71 Parents: afbd9e6 2af8243 Author: daewon <[email protected]> Authored: Fri Mar 30 15:12:26 2018 +0900 Committer: daewon <[email protected]> Committed: Fri Mar 30 15:12:26 2018 +0900 ---------------------------------------------------------------------- .../graphql/types/S2ManagementType.scala | 4 ++-- .../org/apache/s2graph/graphql/SchemaTest.scala | 22 ++++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
