Resolving conflicts.

Miguel Balparda · Miguel Balparda · commit 0d7842933f42 · 2016-11-15T09:58:42.000-03:00
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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,15 @@ sub vcl_hash {`
`313`	`313`	`{{advanced_session_validation}}`
`314`	`314`
`315`	`315`	`}`
	`316`	`+<<<<<<< HEAD`
`316`	`317`	`std.log("vcl_hash end return lookup");`
	`318`	`+=======`
	`319`	`+`
	`320`	`+ if (req.http.X-Varnish-Esi-Access == "customer_group" &&`
	`321`	`+ req.http.Cookie ~ "customer_group=") {`
	`322`	`+ hash_data(regsub(req.http.Cookie, "^.?customer_group=([^;]);.$", "\1"));`
	`323`	`+ }`
	`324`	`+>>>>>>> master`
`317`	`325`	`return (lookup);`
`318`	`326`	`}`
`319`	`327`