summaryrefslogtreecommitdiff
path: root/ext/standard/info.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/info.c')
-rw-r--r--ext/standard/info.c6
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;