worldofbalance / unity-game-client

Unity Client for World of Balance
http://smurf.sfsu.edu/~wob/
9 stars 8 forks source link

remove git meta garbage #47

Closed j1george closed 8 years ago

j1george commented 8 years ago

git added some tags during conflict resolution which i have removed

jensvdh commented 8 years ago

Feel free to merge,

however, I'm seeing tons of mixed spaces and tabs in this file ;) Please indent using 4 spaces, no tabs.