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 3b16ceaf3d3e42e1036751fdcb12780c5d17e257..fc390d6df8a0b8e9fc8ff2e21d665e280d22da93 100644 (file)
--- 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;