Solve merge conflict

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