From 0269aefc30d65ddb5d197bac7819feed5bf78de8 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
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')

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
 )
 </com:TTextHighlighter>
 </p>
-<<<<<<< HEAD
-=======
 
 <h2>Creating Active Record Classes</h2>
 <p>
@@ -141,5 +139,4 @@ At the prompt, enter the following two commands to create <tt>UserRecord</tt> an
 Here we used the <a href="?page=Fundamentals.Components1">namespace format</a> again to specify the classes to be created. The path <tt>Application.database.UserRecord</tt> indicates that we want the <tt>UserRecord</tt> class file to be <tt>protected/database/UserRecord.php</tt>.
 </p>
 
->>>>>>> ef81c44... Quickstart Doc overhaul, pt. 2: active controls + minor fixes
 </com:TContent>
-- 
cgit v1.2.3