@@ -0,0 +1,1532 @@
+package com.wsfmn.habittracker;%0A%0Aimport android.media.Image;%0Aimport android.widget.ImageView;%0A%0Aimport org.apache.commons.lang3.ObjectUtils;%0A%0Aimport java.util.Date;%0A%0A/**%0A * Created by skhanna1 on 10/16/17.%0A */%0A%0Apublic class HabitEvent%7B%0A    private String comment;%0A    private Habit habit;%0A    private Date date;%0A    private Boolean done;%0A%0A    Integer location;%0A    //Will change to appropriate Data Type when implement it(ImageView).%0A    String pic;%0A  %0A    public HabitEvent(Habit habit, Date date, Boolean done, String comment) %7B%0A        this.date = date;%0A        this.done = done;%0A        this.comment = comment;%0A    %7D%0A%0A    public Habit getHabit() %7B%0A        return habit;%0A    %7D%0A%0A    public void setHabit(Habit habit) %7B%0A        this.habit = habit;%0A    %7D%0A%0A    public String getComment() %7B%0A        return comment;%0A    %7D%0A%0A    public void setComment(String comment) %7B%0A        this.comment = comment;%0A    %7D%0A%0A    public void location()%7Bthis.location = 5;%7D%0A    public void AddPic()%7Bthis.pic = %22Image%22;%7D%0A    public void updateHabitHistory()%7B%7D%0A%0A    public String getComment()%7Breturn comment;%7D%0A%0A    public void setComment(String comment)%7Bthis.comment = comment;%7D%0A%0A    public Date getDate()%7Breturn date;%7D%0A%0A    public void setDate(Date date)%7Bthis.date = date;%7D%0A%0A%0A    public Habit getHabit()%7Breturn habit;%7D%0A%0A    public Integer getLocation()%7Breturn this.location;%7D%0A%0A    public String getPic()%7Breturn this.pic;%7D%0A%0A    public void setDone(Boolean done) %7B%0A        this.done = done;%0A    %7D%0A%0A    public Boolean getDone() %7B%0A        return done;%0A    %7D%0A%0A%7D%0A

Fix mergin conflict