Merge pull request #1311 from nexcess/devel

miguelbalparda · web-flow · commit f091a08608f3 · 2016-11-16T08:39:41.000-03:00
Resolving conflicts and fixing a bad merge.
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);
 }
 

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