From 4b27900d1d56d43c69ce9390e9e9e0acff51e9c8 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Thu, 14 Jul 2016 19:11:52 -0500
Subject: [PATCH] Fixed merge issue

---
 .../com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 5521c042c..1092cfd45 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -146,7 +146,6 @@ public class HabitRPGUser extends BaseModel {
         this.profile = profile;
     }
 
-<<<<<<< e956287345a142dd1171f260872d6f1813f43d22
     public ContributorInfo getContributor() {
         return contributor;
     }