merging

2018-11-09 13:00:43 +01:00
parent c5867acd52
commit 8eb1f724ea
21 changed files with 206 additions and 63 deletions
--- a/FlippR-Driver/tests/output/TestCabinetItem.cpp
+++ b/FlippR-Driver/tests/output/TestCabinetItem.cpp
@@ -17,7 +17,7 @@
 // testing purposes
 #define private public

-#include "output/CabinetItem.h"
+#include "output/OutputItem.h"

 using namespace output;
 using namespace fakeit;