From: Steven Barth <steven@midlink.org>
Date: Sat, 28 Jun 2008 16:25:25 +0000 (+0000)
Subject: * Fixed last commit
X-Git-Tag: 0.8.0~751
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=3fc7d3f5de08a6d750cc8ccbe124f23f29bad732;hp=699784791cfc05cc03ebce731dca5e5c29b0ab87;p=project%2Fluci.git

* Fixed last commit
---

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