unresolved merge conflicts in psiturk/psiturk_shell.py

NYUCCL / psiTurk

An open platform for science on Amazon Mechanical Turk.

https://psiturk.org

MIT License

277 stars 140 forks source link

Closed dylnb closed 10 years ago

dylnb commented 10 years ago

screen shot 2014-04-03 at 7 57 26 pm

screen shot 2014-04-03 at 7 57 47 pm

gureckis commented 10 years ago

the repo is reset. the offending parties have been dealt with.