Fixed merge issue

2026-07-13 01:38:21 +00:00 · 2016-07-14 19:11:52 -05:00 · 2016-07-14 19:11:52 -05:00 · 4b27900d1d
commit 4b27900d1d
parent 4df8d3c615
1 changed files with 0 additions and 1 deletions
--- 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;
    }