From d5fdd84da435ae92cf22e055768aeaed4b178ddf Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sat, 24 Jan 2015 08:21:14 -0500
Subject: [PATCH] removed stray git-conflict line

---
 src/js/static-net-filtering.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
index 1173b20d4..4c350c875 100644
--- a/src/js/static-net-filtering.js
+++ b/src/js/static-net-filtering.js
@@ -68,7 +68,7 @@ var typeNameToTypeValue = {
      'inline-script': 14 << 4,
              'popup': 15 << 4
 };
-var typeOtherToTypeValue = typeNameToTypeValue.other;
+var typeOtherValue = typeNameToTypeValue.other;
 
 const BlockAnyTypeAnyParty = BlockAction | AnyType | AnyParty;
 const BlockAnyType = BlockAction | AnyType;
@@ -1867,10 +1867,9 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r
     pageHostname = context.pageHostname || '';
 
     // Be prepared to support unknown types
-    var type = typeNameToTypeValue[requestType] || typeOtherToTypeValue;
+    var type = typeNameToTypeValue[requestType] || typeOtherValue;
     var categories = this.categories;
     var bf = false, bucket;
->>>>>>> f718e8e1f239690eae7ff964e1e2c3535c781043
 
     // Tokenize only once
     this.tokenize(url);
@@ -1928,7 +1927,7 @@ FilterContainer.prototype.matchString = function(context) {
     // https://github.com/gorhill/uBlock/issues/519
     // Use exact type match for anything beyond `other`
     // Also, be prepared to support unknown types
-    var type = typeNameToTypeValue[context.requestType] || typeOtherToTypeValue;
+    var type = typeNameToTypeValue[context.requestType] || typeOtherValue;
     if ( type > 8 << 4 ) {
         return this.matchStringExactType(context, context.requestURL, context.requestType);
     }