resolved all merge conflicts

2018-07-11 17:06:28 +02:00
parent 685b6ac1ad
commit de88e3969b
1 changed files with 0 additions and 4 deletions
--- a/FlippR-Driver/tests/input/TestEventNotifier.cpp
+++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp
@@ -59,12 +59,8 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no

      THEN("The EventHandler gets saved")
      {
-<<<<<<< HEAD
        REQUIRE(*(notifier.event_handlers.find(&event_handler_mock.get())) == &event_handler_mock.get());
        REQUIRE_FALSE(notifier.event_handlers.empty() );
-=======
-        REQUIRE(*notifier.event_handler.begin() == &event_handler_mock.get());
->>>>>>> ddb6d445dd3d61956203a4864797d0b4d17cd277
      }
    }