src: revert git auto merge fail

This commit is contained in:
Andreas Stallinger
2017-08-10 13:41:43 +02:00
parent 37ead804bf
commit eaf9df8551
3 changed files with 36 additions and 2 deletions
-1
View File
@@ -3,7 +3,6 @@
#include "component/view/DialogView.h"
#include "data/storage/PersistentStorage.h"
#include "utility/messaging/type/MessageFinishedParsing.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/messaging/type/MessageQuitApplication.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/scheduling/Blackboard.h"