Merge pull request #406 from mattpage/master

Removed merge comment that was preventing NativeControls.js from working
phonegap · Mar 21, 2012 · c0c4fb6 · c0c4fb6
2 parents 8daf963 + 9ae7430
commit c0c4fb6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/iOS/NativeControls/NativeControls.js b/iOS/NativeControls/NativeControls.js
@@ -306,8 +306,4 @@ NativeControls.prototype.setStatusBarVisibilty = function(bHide)
 if(!window.plugins)
   window.plugins = {};
 
-<<<<<<< HEAD
  window.plugins.nativeControls = new NativeControls();
-=======
- window.plugins.nativeControls = new NativeControls();
->>>>>>> CordovaSupport