godzil/nodemcu-httpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Artem Pastukhov 2015-04-02 16:11:33 +03:00
parent dd7aa55d96
commit 596d9dd06b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
http/node_info.lua
View File

@ -1,9 +1,6 @@
local function sendHeader(connection) local function sendHeader(connection)
<<<<<<< HEAD
connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nCache-Control: private, no-store\r\n\r\n") connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nCache-Control: private, no-store\r\n\r\n")
=======
connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\rCache-Control: private, no-store\r\n\r\n")
>>>>>>> 2357415466bb24cba8ee33109146f6a6a2df0282
end end
local function sendAttr(connection, attr, val) local function sendAttr(connection, attr, val)