cs4fe1ny.iei.txt

Merge branch 'master' of https://github.com/Azans3cr3t/MessMister

Conflicts:
	app/src/main/java/com/example/android/login/NotificationService.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 4 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   .idea/misc.xml
#	modified:   .idea/vcs.xml
#	modified:   app/src/main/java/com/example/android/login/MemberDatabase.java
#	modified:   app/src/main/java/com/example/android/login/NotificationReceiver.java
#	modified:   app/src/main/java/com/example/android/login/NotificationService.java
#	modified:   app/src/main/java/com/example/android/login/homepage.java
#