Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/austintest'
Conflicts:
	src/tests/MinonTests.java
  • Loading branch information
kjf12002 committed May 1, 2015
2 parents 53b0ce9 + c341415 commit 036ba3a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/MinionMock.java
Expand Up @@ -116,6 +116,8 @@ public class MinionMock {

public void minionTakeHit(int damage) {
health-=damage;
if(health <= 0)
alive= false;
}

public void minionTakeDamage() {
Expand Down
5 changes: 0 additions & 5 deletions src/MinonTests.java

This file was deleted.

0 comments on commit 036ba3a

Please sign in to comment.