FirehoseCommunity / DEFCON

6 stars 4 forks source link

Issue110 - Admin Can Destroy Posts #124

Closed Matt-Lepley closed 8 years ago

kenmazaika commented 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!

kenmazaika commented 8 years ago

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.

kenmazaika commented 8 years ago

Let's redo this.