From 48a7e49e29c2abb2a86b7f684c74776710fd61f4 Mon Sep 17 00:00:00 2001 From: heav-4 Date: Sat, 26 Feb 2022 00:02:48 +0000 Subject: fix merge conflict (realer) --- zzcxz.cgi | 8 -------- 1 file changed, 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 -- cgit v1.2.3