cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [7/8] git commit: stashing my changes
Date Fri, 21 Feb 2014 22:39:43 GMT
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 <axel@nennker.de>
Authored: Fri Feb 21 22:32:01 2014 +0100
Committer: ignisvulpis <axel@nennker.de>
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
         }
     }
 };
+


Mime
View raw message