Merged terrain.h too

src/include/terrain.h

@@ -16,12 +16,9 @@ class Terrain {
 		Passability isPassable();
 		Mapped isSeen();
 		Visibility getVisibility();
-<<<<<<< HEAD
 		bool checked = false;
 		Coord parent;
-=======
 		void setIsSeen(Mapped);
->>>>>>> 4e011a31a79d32522ad4c3345d5db97c6746eafd
 	private:
 		char character;
 		Visibility visible;