commit | a8060219d5aa22b17c2f5ed0a1eb109ec68dc3da | [log] [tgz] |
---|---|---|
author | Steven Gill <stevengill97@gmail.com> | Mon Oct 28 12:13:43 2013 -0700 |
committer | Steven Gill <stevengill97@gmail.com> | Mon Oct 28 12:13:43 2013 -0700 |
tree | 2823aea7b4d6ef9ddfa7db7adb3daa4df388907f | |
parent | 4d4d479b3c0467da69911b960bbf47ca6a80c897 [diff] | |
parent | e5868f8ecb0bd1f1a7a4fd868a437efab7dd020a [diff] |
fixed merge conflict
To install this plugin, follow the Command-line Interface Guide.
If you are not using the Cordova Command-line Interface, follow Using Plugman to Manage Plugins.