A bit of new-fangled AMD code accidentally made it into 1.0 stable.

jquery-archive · Jan 24, 2012 · 93d89da · 93d89da
1 parent 8303055
commit 93d89da
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js
@@ -2,12 +2,6 @@
 * "events" plugin - Handles events
 */
 
-<<<<<<< HEAD
-=======
-//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
-define( [ "jquery.mobile.core", "jquery.mobile.media", "jquery.mobile.support", "jquery.mobile.vmouse" ], function() {
-//>>excludeEnd("jqmBuildExclude");
->>>>>>> 1a52240... Fix for issue #2933 - get_orientation() and hence getScreenHeight() doesn't work on some devices
 (function( $, window, undefined ) {
 
 // add new event shortcuts