prog694/joebot — comment on commit d2907a0b5ecd3c4137c563196e692677b61d24b2
File: joebot.test/test/edu/stuy/commands/ConveyAutomaticTest.java line 105
By acarrillo:

Also, looks like we committed broken merges again?