Browse files

Merge pull request #406 from mattpage/master

Removed merge comment that was preventing NativeControls.js from working
  • Loading branch information...
2 parents 8daf963 + 9ae7430 commit c0c4fb6922281eb80064d90072bc3c0bdf58f1a4 @RandyMcMillan RandyMcMillan committed Mar 21, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 iOS/NativeControls/NativeControls.js
View
4 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

0 comments on commit c0c4fb6

Please sign in to comment.