vj1lbpjx.mrb.txt

Merge branch 'master' of https://github.com/YvensFaos/GondarEngine

Conflicts:
	GondarEngine/gsGGJGlobals.h resolved
#
# 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 2 and 3 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   GondarEngine/gsGGJEnemy.cpp
#	modified:   GondarEngine/gsGGJGlobals.h
#	modified:   GondarEngine/gsGGJNumber.cpp
#	modified:   GondarEngine/gsGGJNumber.h
#	modified:   GondarEngine/gsGGJPlayer.cpp
#	modified:   GondarEngine/gsGGJScore.cpp
#	modified:   GondarEngine/gsGGJScore.h
#