(p8): fix merge conflict

3f94b4cd · Pavel Vainerman · 560875d8 · 3f94b4cd
Commit 3f94b4cd authored Feb 05, 2019 by Pavel Vainerman
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

lproc.cc extensions/LogicProcessor/tests/lproc.cc +0 -4

No files found.
--- a/extensions/LogicProcessor/tests/lproc.cc
+++ b/extensions/LogicProcessor/tests/lproc.cc
@@ -144,11 +144,7 @@ TEST_CASE("Logic processor: elements", "[LogicProcessor][elements]")

 	SECTION( "TA2D" )
 	{
-<<<<<<< HEAD
-		TA2D e("1",10);
-=======
 		TA2D e("1", 10);
->>>>>>> 2.7-alt4
 		REQUIRE_FALSE( e.getOut() );

 		e.setIn(1, 5);