Merge pull request #1311 from nexcess/devel

Resolving conflicts and fixing a bad merge.
nexcess · Nov 16, 2016 · f091a08 · f091a08
2 parents e357731 + b1155b3
commit f091a08
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/app/code/community/Nexcessnet/Turpentine/misc/version-4.vcl b/app/code/community/Nexcessnet/Turpentine/misc/version-4.vcl
@@ -313,15 +313,12 @@ sub vcl_hash {
         {{advanced_session_validation}}
 
     }
-<<<<<<< HEAD
-    std.log("vcl_hash end return lookup");
-=======
 
     if (req.http.X-Varnish-Esi-Access == "customer_group" &&
             req.http.Cookie ~ "customer_group=") {
         hash_data(regsub(req.http.Cookie, "^.*?customer_group=([^;]*);*.*$", "\1"));
     }
->>>>>>> master
+    std.log("vcl_hash end return lookup");
     return (lookup);
 }