left some conflict markers in - oops

n1k0 · Aug 17, 2011 · 88cb8f3 · 88cb8f3
1 parent bd00557
commit 88cb8f3
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/mongoengine/queryset.py b/mongoengine/queryset.py
@@ -617,15 +617,9 @@ def _transform_query(cls, _doc_cls=None, _field_operation=False, **query):
         """
         operators = ['ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',
                      'all', 'size', 'exists', 'not']
-<<<<<<< HEAD
-        geo_operators = ['within_distance', 'within_spherical_distance', 'within_box', 'near', 'near_sphere']
+        geo_operators = ['within_distance', 'within_spherical_distance', 'within_box', 'within_polygon' 'near', 'near_sphere']
         match_operators = ['contains', 'icontains', 'startswith',
                            'istartswith', 'endswith', 'iendswith',
-=======
-        geo_operators = ['within_distance', 'within_spherical_distance', 'within_box', 'within_polygon', 'near', 'near_sphere']
-        match_operators = ['contains', 'icontains', 'startswith', 
-                           'istartswith', 'endswith', 'iendswith', 
->>>>>>> master
                            'exact', 'iexact']
 
         mongo_query = {}