Return-Path: <dev-return-62841-archive-asf-public=cust-asf.ponee.io@cordova.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 6BA8E200B7D
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sat, 27 Aug 2016 00:03:05 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 6A1F9160AC3; Fri, 26 Aug 2016 22:03:05 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id D6B46160AB6
	for <archive-asf-public@cust-asf.ponee.io>; Sat, 27 Aug 2016 00:03:04 +0200 (CEST)
Received: (qmail 14124 invoked by uid 500); 26 Aug 2016 22:03:04 -0000
Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@cordova.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@cordova.apache.org>
List-Post: <mailto:dev@cordova.apache.org>
List-Id: <dev.cordova.apache.org>
Reply-To: dev@cordova.apache.org
Delivered-To: mailing list dev@cordova.apache.org
Received: (qmail 14105 invoked by uid 99); 26 Aug 2016 22:03:03 -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; Fri, 26 Aug 2016 22:03:03 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 91D73DFF57; Fri, 26 Aug 2016 22:03:03 +0000 (UTC)
From: ktop <git@git.apache.org>
To: dev@cordova.apache.org
Reply-To: dev@cordova.apache.org
Message-ID: <git-pr-486-cordova-lib@git.apache.org>
Subject: [GitHub] cordova-lib pull request #486: CB-11776 check edit-config target exists
Content-Type: text/plain
Date: Fri, 26 Aug 2016 22:03:03 +0000 (UTC)
archived-at: Fri, 26 Aug 2016 22:03:05 -0000

GitHub user ktop opened a pull request:

    https://github.com/apache/cordova-lib/pull/486

    CB-11776 check edit-config target exists

    Missing a case in the conflict checking for edit-config. If the target doesn't exist in <platform>.json, and cannot resolve to an existing target, then no conflict should be found. 

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/ktop/cordova-lib ecerror

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cordova-lib/pull/486.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #486
    
----
commit a7e6634217e187434d560ac2d32bf352662b3a25
Author: ktop <ktop500@gmail.com>
Date:   2016-08-26T21:59:46Z

    CB-11776 check edit-config target exists

----


---
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