You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/08/07 22:16:23 UTC
[8/8] git commit: fix merge conflict
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/52d35482
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/52d35482
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/52d35482
Branch: refs/heads/master
Commit: 52d35482f9ed9e9f928cc4bff58ac1e7fb5ef3cf
Parents: 5ed06ef 85b5370
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Aug 7 13:15:10 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Aug 7 13:15:10 2014 -0700
----------------------------------------------------------------------
tests/plugin.xml | 1 +
tests/tests.js | 107 ++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 101 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/52d35482/tests/plugin.xml
----------------------------------------------------------------------
diff --cc tests/plugin.xml
index 235182b,fe9374f..a84cebb
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@@ -22,7 -22,7 +22,8 @@@
xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.file.tests"
- version="1.2.1-dev">
+ version="1.2.1-dev">
++
<name>Cordova File Plugin Tests</name>
<license>Apache 2.0</license>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/52d35482/tests/tests.js
----------------------------------------------------------------------