diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2018-07-27 23:04:22 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-08-09 21:32:53 +0300 |
| commit | a434f2bde1f80e1a0ddcda0961a7ff102de152d6 (patch) | |
| tree | 2c1bed74b47e4129add2ea0c8e5158bdd35ce96a /include/webserver_common.hpp | |
| parent | 1b0044bb9a92cd90a59dae1786640411e40ca3f3 (diff) | |
| download | bmcweb-a434f2bde1f80e1a0ddcda0961a7ff102de152d6.tar.xz | |
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 'include/webserver_common.hpp')
| -rw-r--r-- | include/webserver_common.hpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/webserver_common.hpp b/include/webserver_common.hpp index 30b567cd66..f0cfe11968 100644 --- a/include/webserver_common.hpp +++ b/include/webserver_common.hpp @@ -17,7 +17,6 @@ #include "security_headers_middleware.hpp" #include "token_authorization_middleware.hpp" -#include "security_headers_middleware.hpp" #include "webserver_common.hpp" using CrowApp = crow::App<crow::persistent_data::Middleware, |