[gnome-terminal/wip/mallard-merge: 266/283] Help: Fixed merge conflicts in app-colors.page.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 7345236d82e76ccdfbf40398e7afc1b7843a00b0
Author: Sindhu S <sindhus live in>
Date:   Sun Mar 3 12:45:44 2013 +0530

    Help: Fixed merge conflicts in app-colors.page.

 help/C/app-colors.page |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/help/C/app-colors.page b/help/C/app-colors.page
index 1c014b1..f5a9223 100644
--- a/help/C/app-colors.page
+++ b/help/C/app-colors.page
@@ -32,12 +32,6 @@
   change the colors that are used for the text and background. You can use
   colors from your theme, select one of the presets or use a custom scheme.</p>
 
-<<<<<<< HEAD
-=======
-  <section id="from-system-theme">
-    <title>Use colors from your system theme</title>
->>>>>>> Help: Reworded help in app-colors.page.
-
   <section id="system-theme">
     <title>Use colors from your system theme</title>
 
@@ -107,15 +101,6 @@
         change.</p>
       </item>
       <item>
-<<<<<<< HEAD
-        <p>Choose your desired color from the color sample blocks and click
-        <gui style="button">Select</gui>.</p>
-        <p>If you wish to select a custom color, click on
-        <gui style="button">+</gui>. You can input the desired color either by
-        typing in the hexadecimal color code, or by dragging the slider and the
-        crosshairs. Click <gui style="button">Select</gui>.</p>
-        <p>Your changes will be applied automatically.</p>
-=======
         <!-- Note to self: check UI -->
         <p>Choose your desired color from the color sample and click
         <gui style="button">Select</gui>.</p>
@@ -135,7 +120,6 @@
       <item>
         <p>Click <gui style="button">Close</gui> to quit the dialog and return
         to <app>Terminal</app>.</p>
->>>>>>> Help: Reworded help in app-colors.page.
       </item>
     </steps>
 
@@ -147,4 +131,4 @@
 
   </section>
 
-</page>
+</page>
\ No newline at end of file