commit a434f2bde1f80e1a0ddcda0961a7ff102de152d6
author Ed Tanous <ed.tanous@intel.com> Fri Jul 27 13:04:22 2018 -0700
committer Ed Tanous <ed.tanous@intel.com> Thu Aug 09 11:32:53 2018 -0700
tree 2c1bed74b47e4129add2ea0c8e5158bdd35ce96a
parent 1b0044bb9a92cd90a59dae1786640411e40ca3f3

Fix merge conflict

Got a couple patches that collided in air, and now builds are broken.
This resolves the collision by moving the new patches forward to the
latest #defines

Change-Id: I1fe35d17a68c61ad90752ae73000e2579131bf5d
Signed-off-by: Ed Tanous <ed.tanous@intel.com>

include/persistent_data_middleware.hpp

diff --git a/include/persistent_data_middleware.hpp b/include/persistent_data_middleware.hpp
index d43b4f2..706f6f4 100644
--- a/include/persistent_data_middleware.hpp
+++ b/include/persistent_data_middleware.hpp
@@ -77,8 +77,8 @@
               }
 
               BMCWEB_LOG_DEBUG << "Restored session: " << newSession->csrfToken
-                             << " " << newSession->uniqueId << " "
-                             << newSession->sessionToken;
+                               << " " << newSession->uniqueId << " "
+                               << newSession->sessionToken;
               SessionStore::getInstance().authTokens.emplace(
                   newSession->sessionToken, newSession);
             }
@@ -108,10 +108,9 @@
 
   void writeData() {
     std::ofstream persistentFile(filename);
-    nlohmann::json data{
-        {"sessions", SessionStore::getInstance().authTokens},
-        {"system_uuid", systemUuid},
-        {"revision", jsonRevision}};
+    nlohmann::json data{{"sessions", SessionStore::getInstance().authTokens},
+                        {"system_uuid", systemUuid},
+                        {"revision", jsonRevision}};
     persistentFile << data;
   }