diff options
| author | Steven Barth <steven@midlink.org> | 2008-06-28 16:25:25 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-06-28 16:25:25 +0000 |
| commit | 3fc7d3f5de08a6d750cc8ccbe124f23f29bad732 (patch) | |
| tree | dd86dc6fa9b65925f8ccd1507bacf4070c766180 /libs/httpd | |
| parent | 699784791cfc05cc03ebce731dca5e5c29b0ab87 (diff) | |
* Fixed last commit
Diffstat (limited to 'libs/httpd')
| -rw-r--r-- | libs/httpd/luasrc/httpd/handler/luci.lua | 5 |
1 files changed, 0 insertions, 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 |