Mercurial > hg > soundsoftware-site
comparison test/fixtures/.svn/text-base/wiki_pages.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 | 8661b858af72 |
children |
comparison
equal
deleted
inserted
replaced
519:3be6bc3c2a17 | 524:1248a47e81b3 |
---|---|
60 title: Child_page_2 | 60 title: Child_page_2 |
61 id: 9 | 61 id: 9 |
62 wiki_id: 2 | 62 wiki_id: 2 |
63 protected: false | 63 protected: false |
64 parent_id: 8 | 64 parent_id: 8 |
65 | 65 wiki_pages_010: |
66 created_on: 2007-03-08 00:18:07 +01:00 | |
67 title: Этика_менеджмента | |
68 id: 10 | |
69 wiki_id: 1 | |
70 protected: false | |
71 parent_id: |