Skip to content

U
uniset2
Commit 3f94b4cd authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(p8): fix merge conflict

parent 560875d8
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
extensions/LogicProcessor/tests/lproc.cc
View file @ 3f94b4cd
...@@ -144,11 +144,7 @@ TEST_CASE("Logic processor: elements", "[LogicProcessor][elements]") ...@@ -144,11 +144,7 @@ TEST_CASE("Logic processor: elements", "[LogicProcessor][elements]")
SECTION( "TA2D" ) SECTION( "TA2D" )
{ {
<<<<<<< HEAD
TA2D e("1",10);
=======
TA2D e("1", 10); TA2D e("1", 10);
>>>>>>> 2.7-alt4
REQUIRE_FALSE( e.getOut() ); REQUIRE_FALSE( e.getOut() );
e.setIn(1, 5); e.setIn(1, 5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment