Mercurial > hg > soundsoftware-site
diff test/fixtures/.svn/text-base/enabled_modules.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 | af80e5618e9b |
children |
line wrap: on
line diff
--- a/test/fixtures/.svn/text-base/enabled_modules.yml.svn-base Fri Jul 15 17:21:05 2011 +0100 +++ b/test/fixtures/.svn/text-base/enabled_modules.yml.svn-base Mon Jul 25 14:39:38 2011 +0100 @@ -95,3 +95,7 @@ name: gantt project_id: 5 id: 24 +enabled_modules_025: + name: news + project_id: 2 + id: 25