got rid of git's comments

joh13010 · Apr 23, 2017 · 53cc8cb · 53cc8cb
1 parent 558489d
commit 53cc8cb
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
@@ -204,10 +204,7 @@ public class FinancialStatement
 	{
 		return _totalIncome;
 	}
-
-<<<<<<< HEAD
 
-=======
 	//income getters
 	public int getIncome() 
 	{