Resolving conflicts.

nexcess · Nov 15, 2016 · 0d78429 · 0d78429
2 parents 0107429 + 5317850
commit 0d78429
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/app/code/community/Nexcessnet/Turpentine/misc/version-4.vcl b/app/code/community/Nexcessnet/Turpentine/misc/version-4.vcl
@@ -313,7 +313,15 @@ 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
     return (lookup);
 }