You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/05/18 21:00:39 UTC
[3/6] git commit: Minor fix to MongoDbDataContext
Minor fix to MongoDbDataContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/80be0a38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/80be0a38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/80be0a38
Branch: refs/heads/master
Commit: 80be0a389e1defcc4aeb2bf2bff7611c16fd88d5
Parents: 743e891
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat May 3 19:41:16 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat May 3 19:41:16 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/metamodel/mongodb/MongoDbDataContext.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/80be0a38/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbDataContext.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbDataContext.java b/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbDataContext.java
index 4e3ee5f..9da4ecf 100644
--- a/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbDataContext.java
+++ b/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbDataContext.java
@@ -43,11 +43,8 @@ import org.apache.metamodel.query.Query;
import org.apache.metamodel.query.SelectItem;
import org.apache.metamodel.schema.Column;
import org.apache.metamodel.schema.ColumnType;
-<<<<<<< Upstream, based on origin/master
-import org.apache.metamodel.schema.MutableColumn;
-=======
import org.apache.metamodel.schema.ColumnTypeImpl;
->>>>>>> 4abc0d6 Adapted other modules to work with the ColumnType-as-an-interface change.
+import org.apache.metamodel.schema.MutableColumn;
import org.apache.metamodel.schema.MutableSchema;
import org.apache.metamodel.schema.MutableTable;
import org.apache.metamodel.schema.Schema;