[seahorse/mallard-help: 195/335] Updated help:introduction.page

[Aruna Sankaranarayanan <arunasank src gnome org>]

commit d8913cbeccb82ee10b45bb4c89554ce37882a785
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Wed Jun 19 19:11:49 2013 +0530

    Updated help:introduction.page
    
    Added a few more terms and generally edited page.

 help/C/introduction.page |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/help/C/introduction.page b/help/C/introduction.page
index b7c53da..0574517 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -11,6 +11,13 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
+<<<<<<< HEAD
+=======
+    <!--get written consent from Jim before adding this or changing the
+    legal.xml file
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>-->
+
+>>>>>>> 1dcc9c0... Updated help:introduction.page
     <credit type="author copyright">
       <name>Aruna Sankaranarayanan</name>
       <email its:translate="no">aruna evam gmail com</email>