From 63f11822a40a0a7740c46fbddf23b9e2a9f46d44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@php.net>
Date: Fri, 3 Mar 2006 12:42:34 +0000
Subject: [PATCH] - fixed a typo (bug #36580)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@208539 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/ps/functions/ps-add-note.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/reference/ps/functions/ps-add-note.xml b/reference/ps/functions/ps-add-note.xml
index 02f3483979..d1553fa490 100644
--- a/reference/ps/functions/ps-add-note.xml
+++ b/reference/ps/functions/ps-add-note.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry id="function.ps-add-note">
  <refnamediv>
@@ -23,16 +23,10 @@
   </methodsynopsis>
   <para>
    Adds a note at a certain position on the page. Notes are like little
-<<<<<<< ps-add-note.xml
    rectangular sheets with text on it, which can be placed anywhere on
    a page. They
    are shown either folded or unfolded. If unfolded, the specified icon
-=======
-   rectangular sheets with text on it, which can be place somewhere on
-   a page. The notes
-   are shown either folded or unfolded. If unfolded the specified icon
->>>>>>> 1.4
-   is used as placeholder.
+   is used as a placeholder.
   </para>
   <para>
    The note will not be visible if the document is printed or viewed but