Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2

9 years ago · e2f9a710aa
parent 6344e12d8f fc1121b5b7
commit e2f9a710aa
1 changed files with 1 additions and 1 deletions
--- a/.mailmap
+++ b/.mailmap
@ -16,4 +16,4 @@
 # https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html
 # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/
 Erika Savell <esa46@uclive.ac.nz>
-Connor Taylor-Brown <cbt24@cs17086jp.canterbury.ac.nz> <cbt24@uclive.canterbury.ac.nz> <
+Connor Taylor-Brown <cbt24@cs17086jp.canterbury.ac.nz> <cbt24@uclive.canterbury.ac.nz>