comparison test/fixtures/configuration/.svn/text-base/default.yml.svn-base @ 524:1248a47e81b3 feature_36

Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:39:38 +0100
parents 0579821a129a
children
comparison
equal deleted inserted replaced
519:3be6bc3c2a17 524:1248a47e81b3
1 default:
2 somesetting: foo
3
4 production:
5
6 development:
7
8 test: