[gnome-terminal/wip/mallard-merge: 145/346] Help: Recommit of changes on app-cursor.page

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 501467b71384d877d9c071d7ee0a49772a1ebcc8
Author: Sindhu S <sindhus live in>
Date:   Fri Feb 15 17:32:25 2013 +0530

    Help: Recommit of changes on app-cursor.page
    
    Includes changes made by both Ekaterina Gerasimova and Sindhu S.

 help/C/app-cursor.page |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/help/C/app-cursor.page b/help/C/app-cursor.page
index 87b8d03..1371667 100644
--- a/help/C/app-cursor.page
+++ b/help/C/app-cursor.page
@@ -1,3 +1,4 @@
+
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="cursor">
@@ -50,6 +51,7 @@
         </item>
       </terms>
     </item>
+<<<<<<< Updated upstream
     <item>
       <p>Once you have made your selection, your preference is saved
       automatically. Click <gui style="button">Close</gui> to quit the profile
@@ -57,4 +59,14 @@
     </item>
   </list>
 
+=======
+    <item><p> _ called <gui>Underline</gui>.</p>
+    </item>
+  </list>
+
+  <p>Go to <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
+  Preferences</gui><gui style="tab">General</gui></guiseq> and choose desired
+  cursor from the menu next to <gui>Cursor shape</gui>.</p>
+
+>>>>>>> Stashed changes
 </page>