[pybliographer] Fixed bug in gui-opening.page

From: Mario Blättermann <mariobl src gnome org>
To: commits-list gnome org
Cc:
Subject: [pybliographer] Fixed bug in gui-opening.page
Date: Fri, 29 Oct 2010 19:56:25 +0000 (UTC)

commit 73cc3ab2c503be13fe55ea7b379320a3167b359f
Author: Mario BlÃ¤ttermann <mariobl gnome org>
Date:   Fri Oct 29 21:54:33 2010 +0200

    Fixed bug in gui-opening.page

 help/C/gui-opening.page |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/help/C/gui-opening.page b/help/C/gui-opening.page
index d38279b..ca9bb8e 100644
--- a/help/C/gui-opening.page
+++ b/help/C/gui-opening.page
@@ -7,11 +7,7 @@
     <link type="guide" xref="gui"/>
     <revision pkgversion="3.0" version="0.1" date="2010-10-24" status="incomplete"/>
     <desc>
-<<<<<<< HEAD
-      How to open an existing database..
-=======
-      How to open an existing database.
->>>>>>> Fixed some bugs in *.page files
+    How to open an existing database.
     </desc>
     <credit type="author">
       <name>Zolt&#225;n K&#243;ta</name>

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]