Resolve conflict

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1027 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/compile.php b/compile.php
index a7ce070de15e2785f420a487661e80134b46b0bf..33757a223a7135510d35b28e2d3f51e2ba1e5cb2 100644 (file)
--- a/compile.php
+++ b/compile.php
@@ -132,13 +132,9 @@ function php_shrink($input) {
                                if ($tokens[$i+1][0] === T_ECHO) {
                                        // join two consecutive echos
                                        next($tokens);
-<<<<<<< HEAD:compile.php
-                                       $token[1] = '.'; //! join ''.'' and "".""
+                                       $token[1] = ','; // '.' would conflict with "a".1+2 and would use more memory //! remove ',' and ","
                                } else {
                                        $in_echo = false;
-=======
-                                       $token[1] = ','; // '.' would conflict with "a".1+2 and would use more memory //! remove ',' and ","
->>>>>>> Use comma in consecutive echos:compile.php
                                }
                        } elseif ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) {
                                $token[1] = '$' . $short_variables[$token[1]];