From 93d89da06fe7388038624b4ab2925ed984b6e0bf Mon Sep 17 00:00:00 2001
From: Mat Marquis <mat@matmarquis.com>
Date: Mon, 23 Jan 2012 23:35:00 -0500
Subject: [PATCH] A bit of new-fangled AMD code accidentally made it into 1.0
 stable.

---
 js/jquery.mobile.event.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js
index 6a737614..d51be0ec 100644
--- 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