oops! i didn't save changes from the merge conflict >.<

bin/MangoHud.conf

@@ -117,11 +117,8 @@ background_alpha=0.5
 # log_duration
 ### Define name and location of the output file (Required for logging)
 # output_file
-<<<<<<< HEAD
 ### Permit uploading logs directly to Flightlessmango.com
 # permit_upload=1
-=======
 ### Define a '+'-separated list of percentiles shown in the benchmark results.
 ### Use "AVG" to get a mean average. Default percentiles are 97+AVG+1+0.1
 # benchmark_percentiles=
->>>>>>> 6d4ed4e... implement configurable benchmark percentiles.

src/overlay_params.cpp

@@ -422,11 +422,8 @@ parse_overlay_config(struct overlay_params *params,
    params->font_scale_media_player = 0.55f;
    params->log_interval = 100;
    params->media_player_order = { MP_ORDER_TITLE, MP_ORDER_ARTIST, MP_ORDER_ALBUM };
-<<<<<<< HEAD
    params->permit_upload = 0;
-=======
    params->benchmark_percentiles = { "97% ", "AVG ", "1%  ", "0.1%" };
->>>>>>> 6d4ed4e... implement configurable benchmark percentiles.
 
 #ifdef HAVE_X11
    params->toggle_hud = { XK_Shift_R, XK_F12 };

src/overlay_params.h

@@ -89,11 +89,8 @@ typedef unsigned long KeySym;
    OVERLAY_PARAM_CUSTOM(cpu_text)                    \
    OVERLAY_PARAM_CUSTOM(gpu_text)                    \
    OVERLAY_PARAM_CUSTOM(log_interval)                \
-<<<<<<< HEAD
    OVERLAY_PARAM_CUSTOM(permit_upload)               \
-=======
    OVERLAY_PARAM_CUSTOM(benchmark_percentiles)       \
->>>>>>> 6d4ed4e... implement configurable benchmark percentiles.
    OVERLAY_PARAM_CUSTOM(help)
 
 enum overlay_param_position {