Merge remote-tracking branch 'upstream/master'

# Conflicts: # plugin.xml
Telerik-Verified-Plugins · Sep 11, 2016 · a3ac7f4 · a3ac7f4
1 parent 4193b4b
commit a3ac7f4
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -3,8 +3,6 @@
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="nl.x-services.plugins.calendar"
-    version="4.5.1">
-    id="cordova-plugin-calendar"
     version="4.5.2">
 
   <name>Calendar</name>