merge error

4 years ago · 184ddf0aae
parent 7f1bc00739 41bc0e89dc
commit 184ddf0aae
1 changed files with 0 additions and 4 deletions
--- a/src/components/TopLevel.component.js
+++ b/src/components/TopLevel.component.js
@ -80,8 +80,4 @@ export default class TopLevelComponent extends Component {
        game_service.set_n_boats(5)
        game_service.advance_game_state()
    }
-
-<<<<<<< HEAD
 }
-=======
->>>>>>> 19aa3733d0604f37e6875b825eb51ccd4092d4c4