[PHP-CVS] com php-src: - Fix conflict: phpdbg_prompt.c test.php

[Bob Weinand]

Commit:    33098232dc27c4f22dd38d17268fd59a64b1d000
Author:    Felipe Pena <felipe...@gmail.com>         Sun, 17 Nov 2013 14:13:13 
-0200
Parents:   478446b665acb80411b0c7dee417962e88848842 
02e3718ef907c3d6063ea746e5a1fd1047ded7bc
Branches:  PHP-5.6

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=33098232dc27c4f22dd38d17268fd59a64b1d000

Log:
- Fix conflict

Changed paths:
  MM  phpdbg_prompt.c
  MM  test.php


Diff:
diff --cc test.php
index fab577b,d11310b..dc1ecdb
--- 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(


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php