Permalink
Browse files

Fixed xdebug.ini sample file.

  • Loading branch information...
1 parent 973023c commit dc90da16f8162324f22ff4b1548259f2b8f670e2 @derickr committed Dec 8, 2012
Showing with 0 additions and 14 deletions.
  1. +0 −14 xdebug.ini
View
@@ -17,13 +17,9 @@
; -----------------------------------------------------------------------------
; xdebug.cli_color
;
-<<<<<<< HEAD
-; Type: boolean, Default value: 0
-=======
; Only in Xdebug versions > 2.2
;
; Type: integer, Default value: 0
->>>>>>> 6444e03... Update the changed xdebug.ini.
;
; If this setting is 1, Xdebug will color var_dumps and stack traces output when
; in CLI mode.
@@ -624,7 +620,6 @@
;
; Fields for the computerized format:
;
-<<<<<<< HEAD
; =========== ===== ========== ========== ========== ============ ============= ========================================= ================================ ======== ===========
; Record type 1 2 3 4 5 6 7 8 9 10
; =========== ===== ========== ========== ========== ============ ============= ========================================= ================================ ======== ===========
@@ -633,15 +628,6 @@
; ----------- ----- ---------- ---------- ---------- ------------ ------------- ----------------------------------------- -------------------------------- -------- -----------
; Exit level function # always '1' time index memory usage empty
; =========== ===== ========== ========== ========== ============ ============= ========================================= ================================ ======== ===========
-=======
-; =========== ===== =========== =========== ========== ============ ============= =========================================== ================================ ======== ===========
-; Record type 1 2 3 4 5 6 7 8 9 10
-; =========== ===== =========== =========== ========== ============ ============= =========================================== ================================ ======== ===========
-; Entry level function # always '0' time index memory usage function name user-defined (1) or internal function (0) name of the include/require file filename line number
-; ----------- ----- ----------- ----------- ---------- ------------ ------------- ------------------------------------------- -------------------------------- -------- -----------
-; Exit level function # always '1' time index memory usage empty
-; =========== ===== =========== =========== ========== ============ ============= =========================================== ================================ ======== ===========
->>>>>>> 6444e03... Update the changed xdebug.ini.
;
; See the introduction of Function Traces for a few examples.
;

0 comments on commit dc90da1

Please sign in to comment.