avoid merge conflict

2015-01-19 08:20:38 +01:00 · 2015-01-19 08:20:38 +01:00 · b1f928028d
commit b1f928028d
parent f61e4c63e4
1 changed files with 1 additions and 1 deletions
--- a/team.h
+++ b/team.h
@ -12,7 +12,7 @@ typedef struct{
 // Directions
 enum{
-	SOUTH, NORTH, EAST, WEST
+	NORTH, EAST, SOUTH, WEST
 };
 // communication