From 0269aefc30d65ddb5d197bac7819feed5bf78de8 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 23 Aug 2014 13:08:33 +0200 Subject: Manually backported Wsat --- demos/quickstart/protected/pages/GettingStarted/CommandLine.page | 3 --- 1 file changed, 3 deletions(-) (limited to 'demos/quickstart/protected/pages') diff --git a/demos/quickstart/protected/pages/GettingStarted/CommandLine.page b/demos/quickstart/protected/pages/GettingStarted/CommandLine.page index 6f56cd72..018a493e 100755 --- a/demos/quickstart/protected/pages/GettingStarted/CommandLine.page +++ b/demos/quickstart/protected/pages/GettingStarted/CommandLine.page @@ -109,8 +109,6 @@ PostRecord#1 )

-<<<<<<< HEAD -=======

Creating Active Record Classes

@@ -141,5 +139,4 @@ At the prompt, enter the following two commands to create UserRecord an Here we used the namespace format again to specify the classes to be created. The path Application.database.UserRecord indicates that we want the UserRecord class file to be protected/database/UserRecord.php.

->>>>>>> ef81c44... Quickstart Doc overhaul, pt. 2: active controls + minor fixes -- cgit v1.2.3