Merge branch 'master' of https://github.com/swinginbird/flippr-code

2019-04-15 13:53:34 +02:00
parent 4c7b490300 a7304c2d16
commit 8bc0155c8d
4 changed files with 47 additions and 6 deletions
--- a/FlippR-Driver/src/utility/InputSocketHandler.cpp
+++ b/FlippR-Driver/src/utility/InputSocketHandler.cpp
@@ -4,7 +4,9 @@

 #include "InputSocketHandler.h"

-#include "boost/date_time/posix_time/posix_time.hpp"
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+#include "json.hpp"

 namespace flippR_driver
 {