svn commit - mysqldoc@docsrva: r3835 - in trunk: . gui-common

[paul]

Author: paul
Date: 2006-11-03 07:06:03 +0100 (Fri, 03 Nov 2006)
New Revision: 3835

Log:
 r11592@frost:  paul | 2006-11-03 00:05:50 -0600
 Remove leftover merge debris.
 (I am guessing at which id is correct).


Modified:
   trunk/gui-common/starting-all.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:15175
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11590
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:11301
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:15175
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11592
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:11301


Modified: trunk/gui-common/starting-all.xml
===================================================================
--- trunk/gui-common/starting-all.xml	2006-11-02 23:37:12 UTC (rev 3834)
+++ trunk/gui-common/starting-all.xml	2006-11-03 06:06:03 UTC (rev 3835)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 517 bytes

@@ -7,11 +7,7 @@
     <!ENTITY % gui-common.entities    SYSTEM "../gui-common/gui-common.ent">
     %gui-common.entities;
     ]>
-<<<<<<< .mine
   <chapter id="running-guitools">
-=======
-  <chapter id="starting-gui">
->>>>>>> .r3813
     
     <!--starting tools-->