Mercurial > hg > soundsoftware-site
diff .svn/pristine/e9/e983e3278ec4a038212a8ec1e595dbdd03e2c9d6.svn-base @ 935:fe0249c097f6 live
Merge from the default branch
author | Chris Cannam |
---|---|
date | Wed, 11 Jul 2012 13:33:14 +0100 |
parents | cbb26bc654de |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.svn/pristine/e9/e983e3278ec4a038212a8ec1e595dbdd03e2c9d6.svn-base Wed Jul 11 13:33:14 2012 +0100 @@ -0,0 +1,16 @@ +welcome_2: + id: 1 + page_id: 1 + title: Welcome to the weblog + body: Such a lovely day + version: 24 + author_id: 1 + revisor_id: 1 +welcome_1: + id: 2 + page_id: 1 + title: Welcome to the weblg + body: Such a lovely day + version: 23 + author_id: 2 + revisor_id: 2