From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Thu, 8 Aug 2002 13:59:19 +0000 (+0000)
Subject: the order to do things is save-compile-commit
X-Git-Tag: php-4.3.0dev_zend2_alpha3~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e539c5564db4f6ac7015c1875acb903fc7d1939f;p=php

the order to do things is save-compile-commit
no variations and make sure editor and shell are in the same dir :(
---

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 3b16ceaf3d..fc390d6df8 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -38,9 +38,6 @@
 #include <sys/utsname.h>
 #endif
 
-<<<<<<< info.c
-#define SECTION(name)  PUTS("<h2 align='center'>" name "</h2>\n")
-=======
 #ifdef PHP_ATOM_INC
 #include "php_have_iconv.h"
 #endif
@@ -49,8 +46,7 @@
 ZEND_EXTERN_MODULE_GLOBALS(iconv)
 #endif
 
-#define SECTION(name)  PUTS("<h2 align=\"center\">" name "</h2>\n")
->>>>>>> 1.188
+#define SECTION(name)  PUTS("<h2 align='center'>" name "</h2>\n")
 
 PHPAPI extern char *php_ini_opened_path;