learning-unlimited/ESP-Website — pull request #271 by jmoldow (2012-01-31 04:43:04+00:00)
Title: Changes instances of User to ESPUser

In program.models.class_.ClassSubject.conflicts(), the teacher argument
is cast from User to ESPUser, and saved in the user variable. However,
there were still some instances of teacher being used in the method.
This commit changes those references to teacher to references to user.