Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5FDBA187C5 for ; Mon, 4 Jan 2016 20:44:15 +0000 (UTC) Received: (qmail 19078 invoked by uid 500); 4 Jan 2016 20:44:15 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 18994 invoked by uid 500); 4 Jan 2016 20:44:14 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 18983 invoked by uid 99); 4 Jan 2016 20:44:14 -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; Mon, 04 Jan 2016 20:44:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76EA7E0547; Mon, 4 Jan 2016 20:44:14 +0000 (UTC) From: saharshtibrewal To: dev@cordova.apache.org Reply-To: dev@cordova.apache.org References: In-Reply-To: Subject: [GitHub] cordova-android pull request: Makes CLI build play nice along with... Content-Type: text/plain Message-Id: <20160104204414.76EA7E0547@git1-us-west.apache.org> Date: Mon, 4 Jan 2016 20:44:14 +0000 (UTC) Github user saharshtibrewal commented on the pull request: https://github.com/apache/cordova-android/pull/225#issuecomment-168801536 Hi @infil00p I had not opened a JIRA issue for this, and could not find a related JIRA issue at the time. I can resolve the conflicts and do a fresh commit if that helps. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org For additional commands, e-mail: dev-help@cordova.apache.org