usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [32/37] incubator-usergrid git commit: compilation
Date Tue, 03 Mar 2015 20:01:11 GMT
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/USERGRID-422
Commit: 80cd97ec0cffc64bf3674de4e65aec9e69df106c
Parents: fd5109c
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Thu Feb 26 16:36:14 2015 -0700
Committer: Shawn Feldman <sfeldman@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;


Mime
View raw message