osmosacademy / vr-passport

Virtual Reality Campaign

GNU General Public License v3.0

17 stars 10 forks source link

Color change assets #31

Closed peterwilkinson closed 8 years ago

peterwilkinson commented 8 years ago

Conflicts:

ProjectSettings/ProjectSettings.asset

Zulban commented 8 years ago

I'm not a git pro. I know what a merge is, but can you explain what exactly happened here? Is this a conflict with your own branch that you resolved? I'm not sure why I was notified, this interests me :o

peterwilkinson commented 8 years ago

Sorry, there's been so much activity, I'm just catching up on some of the issues...I don't think that one was a big thing. Not sure why you got noticed either. I had more serious issues the last day with things 'disappearing' in the assets folder while still been linked 'broken' in the scene. ..it was a bit weird. Renaming and moving was all good. More people on git, I guess things get a little weird.