fix merge conflicts with MergeLocChanges and develop

NUbots / robocup

The NUbot's RoboCup Code

GNU General Public License v3.0

34 stars 17 forks source link

Closed josiahw closed 11 years ago

josiahw commented 11 years ago

you updated our everything, so fix all the issues :-P

shannonfenn commented 11 years ago

Haha, some of the issues are due to behaviour being changed in both branches too.

BrendanAnnable commented 11 years ago

Conflicts resolved and merged into develop, confirmed as compiling and running.

MergeLocChanges remains untouched.