search

jmtyszka / mrgaze

Eye Tracking and Gaze Estimation in Python
MIT License
23 stars 7 forks source link

Removed "merge marks" from pupilometry and media. #17

Closed danweflen closed 8 years ago

danweflen commented 8 years ago

I removed "<<<<<<HEAD" "======" and other bits of code used created by git during a merge. These were causing the program to crash when run. No testing on actual data done, but at least it doesn't immediately cause python to crash with a syntax error :).

jmtyszka commented 8 years ago

Thanks again Dan! And there I was thinking I'd caught all the merge markup :) Let me know how the testing goes with your own data.