From 058e101fc9f0166095e082b0c33535e65ae6eb16 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Thu, 27 Aug 2009 07:36:41 +0000
Subject: [PATCH] Resolve conflict

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1027 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 compile.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/compile.php b/compile.php
index a7ce070d..33757a22 100644
--- 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]];