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 9D08511DFE for ; Thu, 7 Aug 2014 00:56:40 +0000 (UTC) Received: (qmail 93297 invoked by uid 500); 7 Aug 2014 00:56:31 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 93275 invoked by uid 500); 7 Aug 2014 00:56:31 -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 93202 invoked by uid 500); 7 Aug 2014 00:56:31 -0000 Delivered-To: apmail-incubator-callback-dev@incubator.apache.org Received: (qmail 93198 invoked by uid 99); 7 Aug 2014 00:56:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Aug 2014 00:56:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 187C59C17EC; Thu, 7 Aug 2014 00:56:29 +0000 (UTC) From: purplecabbage To: callback-dev@incubator.apache.org Reply-To: callback-dev@incubator.apache.org References: In-Reply-To: Subject: [GitHub] cordova-mobile-spec pull request: CB-7013 (WP8) use proper string ... Content-Type: text/plain Message-Id: <20140807005630.187C59C17EC@tyr.zones.apache.org> Date: Thu, 7 Aug 2014 00:56:29 +0000 (UTC) Github user purplecabbage commented on the pull request: https://github.com/apache/cordova-mobile-spec/pull/79#issuecomment-51417924 merge conflicts. --- 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. ---