* Fixed last commit

[project/luci.git] / libs / httpd / luasrc / httpd / handler / luci.lua

diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua
index 17882e2..2fcb995 100644 (file)
--- 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