* Fixed last commit

This commit is contained in:
Steven Barth 2008-06-28 16:25:25 +00:00
parent 699784791c
commit 3fc7d3f5de

View file

@ -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