Fixed xdebug.ini sample file.

derickr · Dec 18, 2012 · dc90da1 · dc90da1
1 parent 973023c
commit dc90da1
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/xdebug.ini b/xdebug.ini
@@ -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.
 ;