annotate test/fixtures/configuration/.svn/text-base/overrides.yml.svn-base @ 499:85fd403a7daa cannam

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 13 Jul 2011 12:46:00 +0100
parents 0579821a129a
children
rev   line source
Chris@210 1 default:
Chris@210 2 somesetting: foo
Chris@210 3
Chris@210 4 production:
Chris@210 5
Chris@210 6 development:
Chris@210 7
Chris@210 8 test:
Chris@210 9 somesetting: bar