Closed freddiewpayne closed 5 years ago
The merge conflicts look like they're Unity-related things that I should be able to sort out.
did I break something?
No nothing like that, I just wanted to add some screenshots to the README. The merge conflicts are to do with the Unity project, and I should be able to sort them easily.
Okay, for some reason I can't get this to work... I'll close it for now and see what I can do.
I tried following the command line instructions but got an error message, along the lines of "you don't have permission to do this", when I tried the 'git push origin master' command. @aawadall is this something you would have to do, seeing as you're the owner of the repo? I'm a bit stuck..
Also fixed a bug in the Unity code.