[gnome-keyring/dbus-api] Remove conflict lines from old merge

[Stefan Walter <stefw src gnome org>]

commit 946719e94276122287162e0eaa6e7d2a5cf6254b
Author: Stefan Walter <Stefan Walter>
Date:   Thu Jul 16 00:35:26 2009 +0000

    Remove conflict lines from old merge

 docs/reference/secrets/secrets-docs.sgml |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/docs/reference/secrets/secrets-docs.sgml b/docs/reference/secrets/secrets-docs.sgml
index ce1a209..12bbd38 100644
--- a/docs/reference/secrets/secrets-docs.sgml
+++ b/docs/reference/secrets/secrets-docs.sgml
@@ -403,10 +403,6 @@
     <title>API Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
-<<<<<<< HEAD:docs/reference/secrets/secrets-docs.sgml
 -->
-=======
->>>>>>> Build docs for the secrets API.:docs/reference/secrets/secrets-docs.sgml
-
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>