fix conflicts

2019-05-29 12:55:16 -04:00
parent 28a4b723ff 8e73e9e024
commit e4a725cd22
2 changed files with 8 additions and 1 deletions
--- a/src/com/bayviewglen/zork/Command.java
+++ b/src/com/bayviewglen/zork/Command.java
@@ -108,4 +108,6 @@ class Command {
 	public boolean hasEnemy() {
 		return !enemy.equals("");
 	}
+	
+	
 }