resolve lingering issues from merge of #5 - Githubissues

zackmdavis / Finetooth

an experimental discussion forum

MIT License

2 stars 0 forks source link

resolve lingering issues from merge of #5 #6

Closed zackmdavis closed 10 years ago

zackmdavis commented 10 years ago

@cookjw

remove (not just comment out) merge-conflict markers
remove duplicate imports
make sure code is otherwise sane