From 3ca4d9f239e66fce05c0c57d3b49c479c27aa2c8 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@rightscale.com>
Date: Fri, 11 Sep 2015 23:49:41 -0700
Subject: [PATCH] fix a few minor merge errors

---
 esp-link/cgimqtt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esp-link/cgimqtt.c b/esp-link/cgimqtt.c
index 3803c61..98fcd8b 100644
--- a/esp-link/cgimqtt.c
+++ b/esp-link/cgimqtt.c
@@ -50,7 +50,9 @@ int ICACHE_FLASH_ATTR cgiMqttGet(HttpdConnData *connData) {
       "\"mqtt-status-value\":\"%s\" }",
       flashConfig.slip_enable, flashConfig.mqtt_enable,
       mqtt_states[mqttClient.connState], flashConfig.mqtt_status_enable,
-      flashConfig.mqtt_port, flashConfig.mqtt_hostname, flashConfig.mqtt_client,
+      flashConfig.mqtt_clean_session, flashConfig.mqtt_port,
+      flashConfig.mqtt_timeout, flashConfig.mqtt_keepalive,
+      flashConfig.mqtt_host, flashConfig.mqtt_clientid,
       flashConfig.mqtt_username, flashConfig.mqtt_password,
       flashConfig.mqtt_status_topic, status_buf2);