fix broken master merge

weltling · weltling · commit 4a5fee1b369a · 2013-10-16T06:10:00.000-07:00
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h
@@ -54,7 +54,7 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC);
 
 /* do not export, in php it's available thru spprintf directly */
 zend_str_size_int zend_spprintf(char **message, zend_str_size_int max_len, const char *format, ...);
-=======
+
 END_EXTERN_C()
 
 #endif
