diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2018-07-27 13:04:22 -0700 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-08-09 11:32:53 -0700 |
| commit | a434f2bde1f80e1a0ddcda0961a7ff102de152d6 (patch) | |
| tree | 2c1bed74b47e4129add2ea0c8e5158bdd35ce96a /redfish-core/lib/chassis.hpp | |
| parent | 1b0044bb9a92cd90a59dae1786640411e40ca3f3 (diff) | |
| download | bmcweb-a434f2bde1f80e1a0ddcda0961a7ff102de152d6.tar.gz bmcweb-a434f2bde1f80e1a0ddcda0961a7ff102de152d6.zip | |
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>
Diffstat (limited to 'redfish-core/lib/chassis.hpp')
| -rw-r--r-- | redfish-core/lib/chassis.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/redfish-core/lib/chassis.hpp b/redfish-core/lib/chassis.hpp index 731ea7b..b1c20a5 100644 --- a/redfish-core/lib/chassis.hpp +++ b/redfish-core/lib/chassis.hpp @@ -85,7 +85,7 @@ class OnDemandChassisProvider { chassisList.emplace_back(objpath.substr(lastPos + 1)); } } - // Finally make a callback with usefull data + // Finally make a callback with useful data callback(true, chassisList); }, "xyz.openbmc_project.ObjectMapper", |
