search

aawadall / Game-Off-2018

a Game Off 2018 project
https://aawadall.github.io/Game-Off-2018/
MIT License
0 stars 1 forks source link

Added screenshots to README #16

Closed freddiewpayne closed 5 years ago

freddiewpayne commented 5 years ago

Also fixed a bug in the Unity code.

freddiewpayne commented 5 years ago

The merge conflicts look like they're Unity-related things that I should be able to sort out.

aawadall commented 5 years ago

did I break something?

freddiewpayne commented 5 years ago

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.

freddiewpayne commented 5 years ago

Okay, for some reason I can't get this to work... I'll close it for now and see what I can do.

freddiewpayne commented 5 years ago

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..