comparison test/fixtures/configuration/.svn/text-base/overrides.yml.svn-base @ 246:eeebe205a056 cannam

* Merge from default branch, bringing us up to SVN trunk rev 4993
author Chris Cannam
date Thu, 03 Mar 2011 12:02:03 +0000
parents 0579821a129a
children
comparison
equal deleted inserted replaced
138:fca2657f4aa5 246:eeebe205a056
1 default:
2 somesetting: foo
3
4 production:
5
6 development:
7
8 test:
9 somesetting: bar