From 3075b8c21b35c246e13533bb20677b208b3792c9 Mon Sep 17 00:00:00 2001
From: Sterling Hughes <sterling@php.net>
Date: Mon, 28 Feb 2000 13:53:38 +0000
Subject: [PATCH] couple of corrections I was waiting for in the diffs.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@20670 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/ibase.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/functions/ibase.xml b/functions/ibase.xml
index 79546034c6..d5113584ee 100644
--- a/functions/ibase.xml
+++ b/functions/ibase.xml
@@ -41,7 +41,6 @@ ibase_close($dbh);
 	<para>
 	See also: <function>ibase_pconnect</function>.
 	</para>
-=======
      <paramdef>string <parameter>database</parameter></paramdef>
      <paramdef>string <parameter><optional>username</optional></parameter></paramdef>
      <paramdef>string <parameter><optional>password</optional></parameter></paramdef>
@@ -52,7 +51,6 @@ ibase_close($dbh);
     <para>
      See also: <function>ibase_pconnect</function>.
     </para>
->>>>>>> 1.5
    </refsect1>
   </refentry>