merge error visible on http://tosdr.org/thanks.html

tosdr / tosdr.org

ARCHIVED Source code for tosdr.org

https://github.com/tosdr/CrispCMS

GNU Affero General Public License v3.0

455 stars 26 forks source link

merge error visible on http://tosdr.org/thanks.html #89

Closed michielbdejong closed 11 years ago

michielbdejong commented 11 years ago

look at Joakim Bick, you can see someone (might have been me) accidentally committed a merge error. should also search to see if there are any merge errors committed anywhere else.

hugoroy commented 11 years ago

I don't find any. (only in thanks.html. I removed them)