From 73dfcbbf9710bd71b68fb20a4f23c4b7d8e65ea1 Mon Sep 17 00:00:00 2001
From: Steven Ottens <github@minst.net>
Date: Tue, 26 Jul 2011 17:27:05 +0200
Subject: [PATCH 1/2] moved docs a bit so they don't appear in the hosted
 version

---
 src/jquery.mapquery.core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jquery.mapquery.core.js b/src/jquery.mapquery.core.js
index 9b5ad16..7bcd879 100644
--- a/src/jquery.mapquery.core.js
+++ b/src/jquery.mapquery.core.js
@@ -3,6 +3,7 @@
  * See https://github.com/mapquery/mapquery/blob/master/LICENSE for the
  * full text of the license. */
 
+(function ($) {
 /**
 # jquery.mapquery.core.js
 The main MapQuery file. It contains the MapQuery constructor, the MapQuery.Map
@@ -29,8 +30,7 @@ the 'mapQuery' data object.
      var map = $('#map').mapQuery({layers:[{type:'osm'}]); //create a map with osm
 
      var mq = map.data('mapQuery'); //get the MapQuery object
- */
-(function ($) {
+*/
 $.MapQuery = $.MapQuery || {};
 
 /**

From ba11e007362aef035d89cfbb3b1ca513946d2a77 Mon Sep 17 00:00:00 2001
From: Steven Ottens <github@minst.net>
Date: Thu, 28 Jul 2011 14:27:27 +0200
Subject: [PATCH 2/2] fixed merge problems

---
 src/jquery.mapquery.core.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/jquery.mapquery.core.js b/src/jquery.mapquery.core.js
index 62db6d0..606a343 100644
--- a/src/jquery.mapquery.core.js
+++ b/src/jquery.mapquery.core.js
@@ -2,10 +2,6 @@
  * full list of contributors). Published under the MIT license.
  * See https://github.com/mapquery/mapquery/blob/master/LICENSE for the
  * full text of the license. */
-<<<<<<< HEAD
-
-=======
->>>>>>> master
 (function ($) {
 /**
 # jquery.mapquery.core.js
@@ -38,11 +34,7 @@ the 'mapQuery' data object.
      var map = $('#map').mapQuery({layers:[{type:'osm'}]); //create a map with osm
 
      var mq = map.data('mapQuery'); //get the MapQuery object
-<<<<<<< HEAD
-*/
-=======
  */
->>>>>>> master
 $.MapQuery = $.MapQuery || {};
 
 /**