From 2b7610244d759ecb4742361e5d1de801f4315b9a Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Fri, 25 Nov 2016 11:27:25 +0100 Subject: [PATCH] storm-dft running again --- src/storm-dft/modelchecker/dft/DFTModelChecker.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp b/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp index 6c1834d78..2de46e599 100644 --- a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp +++ b/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp @@ -1,19 +1,13 @@ #include "DFTModelChecker.h" #include "storm/builder/ParallelCompositionBuilder.h" -<<<<<<< 297f3ff48076dbf9b67056c82bc97409ef9fd445:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp -======= -#include "storm/settings/modules/DFTSettings.h" ->>>>>>> moving dfts to their own lib and cli:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp #include "storm/utility/bitoperations.h" #include "storm-dft/builder/ExplicitDFTModelBuilder.h" #include "storm-dft/builder/ExplicitDFTModelBuilderApprox.h" #include "storm-dft/storage/dft/DFTIsomorphism.h" -<<<<<<< 297f3ff48076dbf9b67056c82bc97409ef9fd445:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp #include "storm-dft/settings/modules/DFTSettings.h" -======= ->>>>>>> moving dfts to their own lib and cli:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp + namespace storm { namespace modelchecker {