You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/05/10 18:39:46 UTC
jena git commit: Fixed a merge issue
Repository: jena
Updated Branches:
refs/heads/add-contract-tests b01950b90 -> d492e5406
Fixed a merge issue
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d492e540
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d492e540
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d492e540
Branch: refs/heads/add-contract-tests
Commit: d492e540620d52df1e6eb12e7abdaafd847b3991
Parents: b01950b
Author: Claude Warren <cl...@apache.org>
Authored: Sun May 10 17:39:05 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Sun May 10 17:39:05 2015 +0100
----------------------------------------------------------------------
.../test/java/org/apache/jena/graph/GraphContractTest.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d492e540/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java b/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
index 16bbc26..bf4ccf2 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
@@ -1453,17 +1453,11 @@ public class GraphContractTest<T extends Graph> extends
//
// used to find the object set from the returned set for literal testing
-<<<<<<< HEAD
+
private static final Function<Triple, Node> getObject = new Function<Triple, Node>() {
@Override
public Node apply(Triple t) {
return t.getObject();
-=======
- private static final Map1<Triple, Node> getObject = new Map1<Triple, Node>() {
- @Override
- public Node map1(Triple o) {
- return o.getObject();
->>>>>>> 5bc9578fc31fe58017b80d1a15e41b593ee31074
}
};