[gnome-user-docs/wip/system-admin-guide] index.page fixed

[Jana Svarova <jsvarova src gnome org>]

commit 8aa300d0a574accff7931ab8567ea627e6ebcc96
Author: Jana Svarova <jsvarova redhat com>
Date:   Mon Aug 26 17:18:47 2013 +0200

    index.page fixed
    
    I have created a new section in the index.page called Disks and
    Storage where the sys admin can find how to troubleshoot some
    disk issues.
    
    Conflicts:
        system-admin-guide/C/index.page

 system-admin-guide/C/index.page |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/system-admin-guide/C/index.page b/system-admin-guide/C/index.page
index 60f93fb..1f1c6ac 100644
--- a/system-admin-guide/C/index.page
+++ b/system-admin-guide/C/index.page
@@ -54,7 +54,6 @@
   <title>Installing and integrating applications</title>
 </links>
 
-<<<<<<< HEAD
 <links type="topic" style="toronto" groups="extensions">
   <title>Shell extensions</title>
 </links>
@@ -71,14 +70,8 @@
   <title>Background on technologies</title>
 </links>
 
-<links type="topic" style="toronto" groups="prob">
-=======
-<section style="toronto" id="disks-storage">
+<links style="toronto" groups="disks-storage">
   <title>Disks and Storage</title>
-</section>
-
-<section style="toronto" id="prob">
->>>>>>> 335c356... Seven disk- pages created.
-  <title>Troubleshooting</title>
 </links>
+
 </page>