From faf1c14c11f3e6026f786e9587715c10b13c723e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 25 Apr 2009 10:16:00 -0400
Subject: Manual conflict resolution

---
 doc/reference/shell/tmpl/e-shell-window.sgml | 2 +-
 doc/reference/shell/tmpl/e-shell.sgml        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'doc/reference')

diff --git a/doc/reference/shell/tmpl/e-shell-window.sgml b/doc/reference/shell/tmpl/e-shell-window.sgml
index f1bbeac5e7..7c5442ad96 100644
--- a/doc/reference/shell/tmpl/e-shell-window.sgml
+++ b/doc/reference/shell/tmpl/e-shell-window.sgml
@@ -49,7 +49,7 @@ EShellWindow
 </para>
 
 @shell: 
-@safe_mode: 
+@component_id: 
 @Returns: 
 
 
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 04935e1de6..5907a493a3 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -203,7 +203,6 @@ EShell
 </para>
 
 @shell: 
-@parent: 
 
 
 <!-- ##### FUNCTION e_shell_get_network_available ##### -->
-- 
cgit v1.2.3