From a434f2bde1f80e1a0ddcda0961a7ff102de152d6 Mon Sep 17 00:00:00 2001
From: Ed Tanous <ed.tanous@intel.com>
Date: Fri, 27 Jul 2018 13:04:22 -0700
Subject: 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/sessions.hpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'include/sessions.hpp')

diff --git a/include/sessions.hpp b/include/sessions.hpp
index f7f937df07..f549fde696 100644
--- a/include/sessions.hpp
+++ b/include/sessions.hpp
@@ -36,7 +36,8 @@ struct UserSession {
    *
    * @param[in] j   JSON object from which data should be loaded
    *
-   * @return a shared pointer if data has been loaded properly, nullptr otherwise
+   * @return a shared pointer if data has been loaded properly, nullptr
+   * otherwise
    */
   static std::shared_ptr<UserSession> fromJson(const nlohmann::json& j) {
     std::shared_ptr<UserSession> userSession = std::make_shared<UserSession>();
@@ -45,7 +46,7 @@ struct UserSession {
           element.value().get_ptr<const std::string*>();
       if (thisValue == nullptr) {
         BMCWEB_LOG_ERROR << "Error reading persistent store.  Property "
-                       << element.key() << " was not of type string";
+                         << element.key() << " was not of type string";
         return nullptr;
       }
       if (element.key() == "unique_id") {
@@ -58,7 +59,7 @@ struct UserSession {
         userSession->username = *thisValue;
       } else {
         BMCWEB_LOG_ERROR << "Got unexpected property reading persistent file: "
-                       << element.key();
+                         << element.key();
         return nullptr;
       }
     }
-- 
cgit v1.2.3