Mercurial > hg > soundsoftware-site
diff .svn/pristine/c4/c47ea70159d60a5c0573c2a0aac115d020f1fa5a.svn-base @ 940:9fda6880be81 cannam
Merge from the default branch
author | Chris Cannam |
---|---|
date | Wed, 11 Jul 2012 14:35:59 +0100 |
parents | cbb26bc654de |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.svn/pristine/c4/c47ea70159d60a5c0573c2a0aac115d020f1fa5a.svn-base Wed Jul 11 14:35:59 2012 +0100 @@ -0,0 +1,10 @@ +welcome: + id: 1 + title: Welcome to the weblog + lock_version: 24 + type: LockedPage +thinking: + id: 2 + title: So I was thinking + lock_version: 24 + type: SpecialLockedPage