From 7f1bc007396f1b039273ccabda50dd692432c69a Mon Sep 17 00:00:00 2001 From: Alec Date: Wed, 9 Sep 2020 18:38:51 -0500 Subject: [PATCH] merge conflict #3 --- src/components/TopLevel.component.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/TopLevel.component.js b/src/components/TopLevel.component.js index 25a7cf1..f758d39 100644 --- a/src/components/TopLevel.component.js +++ b/src/components/TopLevel.component.js @@ -61,24 +61,24 @@ export default class TopLevelComponent extends Component { } ship1(){ - game_service.advance_game_state() game_service.set_n_boats(1) + game_service.advance_game_state() } ship2(){ - game_service.advance_game_state() game_service.set_n_boats(2) + game_service.advance_game_state() } ship3(){ - game_service.advance_game_state() game_service.set_n_boats(3) + game_service.advance_game_state() } ship4(){ - game_service.advance_game_state() game_service.set_n_boats(4) + game_service.advance_game_state() } ship5(){ - game_service.advance_game_state() game_service.set_n_boats(5) + game_service.advance_game_state() } <<<<<<< HEAD