make things beautiful

2020-04-17 17:03:12 +02:00 · 2020-04-17 17:03:12 +02:00 · bebc10a81f
commit bebc10a81f
parent 8d0144f1ef
1 changed files with 0 additions and 4 deletions
--- a/frontend/src/lib.rs
+++ b/frontend/src/lib.rs
@ -284,10 +284,6 @@ impl Game {
        }).collect();
    }

-<<<<<<< HEAD
-=======
-
->>>>>>> e5af4f4... too late commit lol
    fn update_ship_counts(&mut self) {
        self.ship_counts = self.states[self.turn].expeditions.iter().map(|s| {
            s.ship_count as usize