pf54n4hk.wse.txt

Merge remote-tracking branch 'refs/remotes/origin/garcon'

# Conflicts:
#	garcon/Docs/LIME Garcon.docx
#
# 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 is up-to-date with 'origin/master'.
#
# All conflicts fixed but you are still merging.
#