Merge branch 'master' of https://sselab.de/lab9/private/git/storm

Conflicts: src/utility/cli.h Former-commit-id: f63886844f
10 years ago · 6b04c33dee
1 changed files with 0 additions and 1 deletions
--- a/src/utility/cli.h
+++ b/src/utility/cli.h
@ -31,7 +31,6 @@ log4cplus::Logger logger;
 // Headers that provide auxiliary functionality.
 #include "src/utility/storm-version.h"
 #include "src/utility/OsDetection.h"
 #include "src/settings/SettingsManager.h"