Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 93B8A17552 for ; Tue, 3 Mar 2015 00:21:50 +0000 (UTC) Received: (qmail 5289 invoked by uid 500); 3 Mar 2015 00:21:50 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 5242 invoked by uid 500); 3 Mar 2015 00:21:50 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 4629 invoked by uid 99); 3 Mar 2015 00:21:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 00:21:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB766E10BB; Tue, 3 Mar 2015 00:21:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grey@apache.org To: commits@usergrid.apache.org Date: Tue, 03 Mar 2015 00:22:12 -0000 Message-Id: <16368c256de445d2a4604b28e24b7966@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/27] 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/USERGRID-280 Commit: 80cd97ec0cffc64bf3674de4e65aec9e69df106c Parents: fd5109c Author: Shawn Feldman Authored: Thu Feb 26 16:36:14 2015 -0700 Committer: Shawn Feldman 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;