On branch paperboys
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#	both added:         world/map/npc/functions/paperboy.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$