EAGLESIX-3004: Stray GIT head block removed.

lib/pipeline/matcher/MatchExpressionParser.js

@@ -32,12 +32,10 @@ var errors = require("../../Errors.js"),
 	AllElemMatchOp = require("./AllElemMatchOp.js"),
 	AtomicMatchExpression = require("./AtomicMatchExpression.js");
 
-<<<<<<< HEAD
 proto.expressionParserTextCallback = require('./TextMatchExpressionParser').expressionParserTextCallbackReal;
-=======
+
 // The maximum allowed depth of a query tree. Just to guard against stack overflow.
 var MAXIMUM_TREE_DEPTH = 100;
->>>>>>> remotes/origin/feature/mongo_2.6.5_matcher
 
 /**
  *
@@ -282,7 +280,7 @@ proto._parseAll = function _parseAll(name, element, level){
  *
  */
 proto._parseArrayFilterEntries = function _parseArrayFilterEntries(entries, theArray){
-	var status, e, r;
+	var status, e, r; s
 	for (var i = 0; i < theArray.length; i++) {
 		e = theArray[i];