fix merge conflict (realer)

1 files changed, 0 insertions, 8 deletions

diff --git a/zzcxz.cgi b/zzcxz.cgi
index 48ecba8..00f9ab4 100755
--- a/zzcxz.cgi
+++ b/zzcxz.cgi
@@ -92,20 +92,12 @@ local function parse_qs(str,sep)
 	return values
 end
 
-<<<<<<< HEAD
 local cookies = env "HTTP_COOKIE" and parse_qs(env "HTTP_COOKIE","; ") or {}
 local flags = {}
 for k,v in pairs(cookies) do
 	local flag = k:match "flag_(.+)"
 	if flag then
 		flags[flag] = v
-=======
-local cookies = parse_qs(env "HTTP_COOKIE", "; ")
-local flags = {}
-for k, v in pairs(cookies) do
-	if k:sub(1,5) == "flag_" then
-		flags[k:sub(6)] = v
->>>>>>> master
 	end
 end