fix merge conflict (real)

1 files changed, 0 insertions, 21 deletions

diff --git a/zzcxz.cgi b/zzcxz.cgi
index a650e98..48ecba8 100755
--- a/zzcxz.cgi
+++ b/zzcxz.cgi
@@ -196,12 +196,7 @@ end
 local load_page
 local function convert_markup(m)
 	local result = {}
-<<<<<<< HEAD
 	local directives = {flags_updated = {}}
-=======
-	local directives = {}
-	directives.flags = {}
->>>>>>> master
 	local code_block = false
 	for line in (m..'\n'):gmatch "(.-)\n" do
 		if not code_block then
@@ -341,13 +336,10 @@ map["^/g/(%w%w%w%w%w)$"] = function(p)
 	local page = load_page(p)
 	if not page then return not_found() end
 	local _, directives = convert_markup(page.content)
-<<<<<<< HEAD
-=======
 	local cookies = {}
 	for k,v in pairs(directives.flags) do
 		table.insert(cookies,"flag_"..k.."="..url_encode(v).."; Secure")
 	end
->>>>>>> master
 	if env "REQUEST_METHOD" ~= "POST" then
 		local actions = {}
 		for _,a in ipairs(page.actions) do
@@ -384,13 +376,8 @@ map["^/g/(%w%w%w%w%w)$"] = function(p)
 				title = html_encode(page.title),
 				content = convert_markup(page.content),
 				actions = table.concat(actions),
-<<<<<<< HEAD
-			}
-		}, {headers = {["set-cookie"] = cookies, bee = "apio form"}}
-=======
 			},
 		}, {headers = {["set-cookie"] = cookies, bees = "3.14"}}
->>>>>>> master
 	else
 		if directives.deadend then
 			return base {
@@ -536,20 +523,12 @@ resp.content_type = resp.content_type or 'text/html'
 resp.status = resp.status or '200 OK'
 resp.headers = resp.headers or {}
 resp.headers['content-type'] = resp.content_type
-<<<<<<< HEAD
-resp.headers.apioform = 3.5
-print("status: "..resp.status)
-for k,v in pairs(resp.headers) do
-	if type(v) == "table" then
-		for _,v2 in ipairs(v) do
-=======
 resp.headers['apioforms'] = math.random(0,104942)/2
 
 print("status: "..resp.status)
 for k,v in pairs(resp.headers) do
 	if type(v) == "table" then
 		for _, v2 in ipairs(v) do
->>>>>>> master
 			print(("%s: %s"):format(k, v2))
 		end
 	else