Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 10579102F1 for ; Fri, 21 Feb 2014 22:39:55 +0000 (UTC) Received: (qmail 12994 invoked by uid 500); 21 Feb 2014 22:39:42 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 12821 invoked by uid 500); 21 Feb 2014 22:39:40 -0000 Mailing-List: contact commits-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 commits@cordova.apache.org Received: (qmail 12764 invoked by uid 99); 21 Feb 2014 22:39:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Feb 2014 22:39:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EF2CC82F5D0; Fri, 21 Feb 2014 22:39:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Fri, 21 Feb 2014 22:39:43 -0000 Message-Id: <63fa1aeec9f1433db4f5c120b4a43ad1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: stashing my changes stashing my changes Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/7caed889 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/7caed889 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/7caed889 Branch: refs/heads/master Commit: 7caed889a84ae6f19d676d3bed3879b8c58fdd46 Parents: 09bd053 Author: ignisvulpis Authored: Fri Feb 21 22:32:01 2014 +0100 Committer: ignisvulpis Committed: Fri Feb 21 22:32:01 2014 +0100 ---------------------------------------------------------------------- src/platforms/amazon-fireos.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/7caed889/src/platforms/amazon-fireos.js ---------------------------------------------------------------------- diff --git a/src/platforms/amazon-fireos.js b/src/platforms/amazon-fireos.js index 4fb89cb..5b85fa3 100644 --- a/src/platforms/amazon-fireos.js +++ b/src/platforms/amazon-fireos.js @@ -58,11 +58,6 @@ module.exports = { }, "resource-file":{ install:function(el, plugin_dir, project_dir) { -<<<<<<< HEAD - require('../../plugman').emit('verbose', 'resource-file is not supported on this platform'); - }, - uninstall:function(el, project_dir) { -======= var src = el.attrib.src; var target = el.attrib.target; require('../../plugman').emit('verbose', 'Copying resource file ' + src + ' to ' + target); @@ -71,7 +66,7 @@ module.exports = { uninstall:function(el, project_dir) { var target = el.attrib.target; common.removeFile(project_dir, target); ->>>>>>> upstream/master } } }; +