fix: merge conflicts

3 years ago · 02df090715
parent 14bfeadd7a
commit 02df090715
2 changed files with 0 additions and 2 deletions
--- a/test/game/components/controlled_flipper_test.dart
+++ b/test/game/components/controlled_flipper_test.dart
@ -21,7 +21,6 @@ void main() {
        score: 0,
        balls: 0,
        bonusHistory: [],
-        activatedBonusLetters: [],
        activatedDashNests: {},
      );
      whenListen(bloc, Stream.value(state), initialState: state);
--- a/test/game/components/controlled_plunger_test.dart
+++ b/test/game/components/controlled_plunger_test.dart
@ -22,7 +22,6 @@ void main() {
        score: 0,
        balls: 0,
        bonusHistory: [],
-        activatedBonusLetters: [],
        activatedDashNests: {},
      );
      whenListen(bloc, Stream.value(state), initialState: state);