From b1155b3bb34cd8d80b2127e95854da509f6eba22 Mon Sep 17 00:00:00 2001
From: Miguel Balparda <mbalparda@nexcess.net>
Date: Wed, 16 Nov 2016 08:21:00 -0300
Subject: [PATCH] Resolving conflicts and fixing a bad merge.

---
 app/code/community/Nexcessnet/Turpentine/misc/version-4.vcl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/community/Nexcessnet/Turpentine/misc/version-4.vcl b/app/code/community/Nexcessnet/Turpentine/misc/version-4.vcl
index 88d4e177d..efef43060 100644
--- 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);
 }