[gnome-terminal/wip/mallard-merge: 104/271] help: please fix merge conflict in pref-bell.page

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 0ddde005e7b02206a17cae08a6174f58b068e083
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Sat Feb 16 22:59:25 2013 +0000

    help: please fix merge conflict in pref-bell.page

 help/C/pref-bell.page |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index 2187ebc..b74b0d1 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -21,6 +21,9 @@
 
   </info>
 
+<!-- Please fix the merge conflict, which will fix the yelp validation
+error. -->
+
   <title>Set audible bell</title>
 <<<<<<< Updated upstream