usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [11/17] incubator-usergrid git commit: method already defined
Date Mon, 05 Jan 2015 19:36:04 GMT
method already defined


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f59aad0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f59aad0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f59aad0d

Branch: refs/heads/two-dot-o
Commit: f59aad0dac0a694c774a2f69ae7d142902ca66ca
Parents: 42da450
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Sun Dec 28 13:36:13 2014 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Sun Dec 28 13:36:13 2014 -0700

----------------------------------------------------------------------
 .../test/resource2point0/endpoints/ApplicationsResource.java   | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f59aad0d/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
index a52e55a..07ac809 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
@@ -44,11 +44,5 @@ public class ApplicationsResource extends CollectionEndpoint {
         return new CollectionEndpoint(name,context,this);
     }
 
-    public TokenResource token(){
-        return new TokenResource(context,this);
-    }
 
-    public TokenResource token() {
-        return new TokenResource(context,this);
-    }
 }


Mime
View raw message