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/webserver_common.hpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include/webserver_common.hpp')

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,
-- 
cgit v1.2.3