From 41bc0e89dce86b904205e7897455cf419b1c5969 Mon Sep 17 00:00:00 2001
From: javier-barea <javierbarealara@gmail.com>
Date: Wed, 9 Sep 2020 18:32:27 -0500
Subject: [PATCH] Solve merge conflict

---
 src/components/TopLevel.component.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/TopLevel.component.js b/src/components/TopLevel.component.js
index 7127d40..66214e2 100644
--- 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