diff test/integration/api_test/token_authentication_test.rb @ 1226:d280360758e5 live

Fix dodgy merge, syntax, defaults
author Chris Cannam
date Tue, 12 Mar 2013 15:26:58 +0000
parents cbb26bc654de
children 622f24f53b42 261b3d9a4903
line wrap: on
line diff