From 4fd16ff45fd40f270099326b483ff6d0e6f641f3 Mon Sep 17 00:00:00 2001
From: Stefan Pranger <stefan.pranger@student.tugraz.at>
Date: Fri, 10 Sep 2021 14:03:11 +0200
Subject: [PATCH] removed conflict marker

---
 src/test/storm/parser/PrismParserTest.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/storm/parser/PrismParserTest.cpp b/src/test/storm/parser/PrismParserTest.cpp
index 51945865d..b28f94f0d 100644
--- a/src/test/storm/parser/PrismParserTest.cpp
+++ b/src/test/storm/parser/PrismParserTest.cpp
@@ -138,7 +138,6 @@ TEST(PrismParser, ComplexTest) {
     EXPECT_EQ(1ul, result.getNumberOfModules());
     EXPECT_EQ(2ul, result.getNumberOfPlayers());
     EXPECT_EQ(5ul, result.getNumberOfLabels());
->>>>>>> d7e3f7ed6 (added a smg to PrismParserTest.cpp)
 }
 
 TEST(PrismParser, UnboundedTest) {