diff test/fixtures/journals.yml @ 1226:d280360758e5 live

Fix dodgy merge, syntax, defaults
author Chris Cannam
date Tue, 12 Mar 2013 15:26:58 +0000
parents cbce1fd3b1b7
children 433d4f72a19b
line wrap: on
line diff