search

zooniverse / scribeAPI

scribe API
MIT License
80 stars 25 forks source link

oops: fix unresolve conflict #400

Closed saschaishikawa closed 9 years ago

saschaishikawa commented 9 years ago

forgot to resolve one conflict