From 5216caa5e64b8be05ff859ba85f90f7a8fa1e6c1 Mon Sep 17 00:00:00 2001
From: Luis Ferro <luis.ferro@eggplant.io>
Date: Tue, 12 Nov 2019 09:44:34 +0100
Subject: Fix diff and remove default macro

---
 src/character.rs | 1 -
 src/world.rs     | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/character.rs b/src/character.rs
index 76f4414..3e6c4a7 100644
--- a/src/character.rs
+++ b/src/character.rs
@@ -2,7 +2,6 @@ use std::cmp;
 
 use crate::world::Point;
 
-#[derive(Default)]
 pub struct Character {
     pub name: String,
     pub class: String,
diff --git a/src/world.rs b/src/world.rs
index d55a9e5..05b82ed 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -193,13 +193,9 @@ pub trait GameWorld {
 
     fn generate(&mut self);
 
-<<<<<<< Updated upstream
     fn to_tilegrid(&self) -> Result<TileGrid, String>;
-=======
-    fn to_tilegrid(&self) -> TileGrid;
 
     fn get_start_location(&self) -> Point;
->>>>>>> Stashed changes
 }
 
 fn hor_dist(point1: Point, point2: Point) -> f32 {
-- 
cgit v1.2.3