[pybliographer] Fixed some bugs in *.page files, added some more pages

From: Mario Blättermann <mariobl src gnome org>
To: commits-list gnome org
Cc:
Subject: [pybliographer] Fixed some bugs in *.page files, added some more pages
Date: Fri, 29 Oct 2010 19:53:44 +0000 (UTC)

commit 3240fd13ea3473cd1deff7f302c20ebd6d543e05
Author: Mario BlÃ¤ttermann <mariobl gnome org>
Date:   Fri Oct 29 21:51:53 2010 +0200

    Fixed some bugs in *.page files, added some more pages

 help/C/gui-opening.page |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/help/C/gui-opening.page b/help/C/gui-opening.page
index 7bb2134..d38279b 100644
--- a/help/C/gui-opening.page
+++ b/help/C/gui-opening.page
@@ -7,7 +7,11 @@
     <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
     </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]