sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-08 08:41:59 +00:00
Code Issues Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-03 11:25:45 +01:00
parent 4db761ef03
commit 14b42d5997
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/web_server/web_server.cpp
View File

@@ -367,9 +367,6 @@ void WebServer::set_css_include(const char *css_include) { this->css_include_ =
void WebServer::set_js_include(const char *js_include) { this->js_include_ = js_include; }
#endif
<<<<<<< Updated upstream
std::string WebServer::get_config_json() {
=======
/// Get uptime in milliseconds using std::chrono::steady_clock (64-bit, no rollover)
static int64_t get_uptime_ms() {
return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch())
@@ -377,7 +374,6 @@ static int64_t get_uptime_ms() {
}
json::SerializationBuffer<> WebServer::get_config_json() {
>>>>>>> Stashed changes
json::JsonBuilder builder;
JsonObject root = builder.root();