diff options
| author | Hartmut Holzgraefe <hholzgra@php.net> | 2002-08-08 13:59:19 +0000 |
|---|---|---|
| committer | Hartmut Holzgraefe <hholzgra@php.net> | 2002-08-08 13:59:19 +0000 |
| commit | e539c5564db4f6ac7015c1875acb903fc7d1939f (patch) | |
| tree | cc37487c89f1c51d156bf999040effb3253a40b5 | |
| parent | 83586a6c0611f4ef8479e8a910f782b824bae67b (diff) | |
| download | php-git-e539c5564db4f6ac7015c1875acb903fc7d1939f.tar.gz | |
the order to do things is save-compile-commit
no variations and make sure editor and shell are in the same dir :(
| -rw-r--r-- | ext/standard/info.c | 6 |
1 files changed, 1 insertions, 5 deletions
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; |