- Fix conflict

diff --cc phpdbg_prompt.c
Simple merge

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