You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/27 00:38:40 UTC
[24/24] incubator-usergrid git commit: compilation
compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/80cd97ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/80cd97ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/80cd97ec
Branch: refs/heads/two-dot-o
Commit: 80cd97ec0cffc64bf3674de4e65aec9e69df106c
Parents: fd5109c
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Feb 26 16:36:14 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Feb 26 16:36:14 2015 -0700
----------------------------------------------------------------------
.../rest/applications/collection/BrowserCompatibilityTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/80cd97ec/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
index f83beae..106151c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
@@ -18,7 +18,6 @@ package org.apache.usergrid.rest.applications.collection;
import java.io.IOException;
-<<<<<<< HEAD
import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
import org.apache.usergrid.rest.test.resource2point0.model.Entity;