From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 17 Nov 2013 16:13:13 +0000 (-0200)
Subject: - Fix conflict
X-Git-Tag: php-5.6.0alpha1~110^2~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33098232dc27c4f22dd38d17268fd59a64b1d000;p=php

- Fix conflict
---

33098232dc27c4f22dd38d17268fd59a64b1d000
diff --cc test.php
index fab577b67e,d11310bb9a..dc1ecdb955
--- a/test.php
+++ b/test.php
@@@ -1,5 -1,7 +1,8 @@@
  <?php
 +
+ if (isset($include))
 -	include (sprintf("%s/web-bootstrap.php", dirname(__FILE__))); 
++	include (sprintf("%s/web-bootstrap.php", dirname(__FILE__)));
+ 
  class phpdbg {
      public function isGreat($greeting = null) {
          printf(