Closed Matt-Lepley closed 8 years ago
This is awesome, but I think the process of merging robert's code in caused conflicts. Can you resolve the conflicts so I can merge things @Matt-Lepley? Thanks!
If someone could resolve the merge conflicts here, it would be helpful so we can merge this in. Feel free to do it, Matt doesn't need to.
Let's redo this.
This is awesome, but I think the process of merging robert's code in caused conflicts. Can you resolve the conflicts so I can merge things @Matt-Lepley? Thanks!