annotate test/fixtures/.svn/text-base/wikis.yml.svn-base @ 726:386fcfd7459f feature_14

Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 24 Oct 2011 15:28:29 +0100
parents 513646585e45
children
rev   line source
Chris@0 1 ---
Chris@0 2 wikis_001:
Chris@0 3 status: 1
Chris@0 4 start_page: CookBook documentation
Chris@0 5 project_id: 1
Chris@0 6 id: 1
Chris@0 7 wikis_002:
Chris@0 8 status: 1
Chris@0 9 start_page: Start page
Chris@0 10 project_id: 2
Chris@0 11 id: 2
Chris@0 12