From 3fc7d3f5de08a6d750cc8ccbe124f23f29bad732 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 28 Jun 2008 16:25:25 +0000 Subject: [PATCH] * Fixed last commit --- libs/httpd/luasrc/httpd/handler/luci.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua index 17882e258..2fcb9953a 100644 --- a/libs/httpd/luasrc/httpd/handler/luci.lua +++ b/libs/httpd/luasrc/httpd/handler/luci.lua @@ -66,12 +66,7 @@ function Luci.handle_get(self, request, sourcein, sinkerr) headers[data1] = data2 end end -<<<<<<< HEAD:libs/httpd/luasrc/httpd/handler/luci.lua -======= - - ->>>>>>> * libs/httpd: Added Cache-Control header to LuCI:libs/httpd/luasrc/httpd/handler/luci.lua local function iter() local res, id, data = coroutine.resume(x) if not res then -- 2.25.1