From 44e609ce86f994674f04df5ba9ea4d4473c42a55 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Mon, 10 Aug 2015 16:19:12 +0200
Subject: [PATCH] merge fix

Former-commit-id: 3fe4dba33f639d74debead984d249d27715a7deb
---
 src/storage/prism/Program.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/storage/prism/Program.cpp b/src/storage/prism/Program.cpp
index 4a595181f..9d6f10c8f 100644
--- a/src/storage/prism/Program.cpp
+++ b/src/storage/prism/Program.cpp
@@ -12,7 +12,6 @@
 
 namespace storm {
     namespace prism {
-<<<<<<< HEAD
         Program::Program(std::shared_ptr<storm::expressions::ExpressionManager> manager, ModelType modelType, std::vector<Constant> const& constants, std::vector<BooleanVariable> const& globalBooleanVariables, std::vector<IntegerVariable> const& globalIntegerVariables, std::vector<Formula> const& formulas, std::vector<Module> const& modules, std::map<std::string, uint_fast64_t> const& actionToIndexMap, std::vector<RewardModel> const& rewardModels, bool fixInitialConstruct, storm::prism::InitialConstruct const& initialConstruct, std::vector<Label> const& labels, std::string const& filename, uint_fast64_t lineNumber, bool finalModel) 
         : LocatedInformation(filename, lineNumber), manager(manager),
             modelType(modelType), constants(constants), constantToIndexMap(),