From 53cc8cb2cc689bb966ca2ffb5d37da7ad1d50fc1 Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Sun, 23 Apr 2017 14:34:35 -0400
Subject: [PATCH] got rid of git's comments

---
 src/model/FinancialStatement.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index c3f2d1d..d96f3e5 100644
--- 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() 
 	{