chore(global): fix some merge conflicts while syncing from nest

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
This commit is contained in:
Andrei Jiroh Halili 2024-10-08 13:33:59 +00:00
parent 5c84218091
commit f0e3f5c93b
3 changed files with 29 additions and 6 deletions

View file

@ -19,8 +19,6 @@ highlight_changes_delay_secs=5
find_comm_in_cmdline=1
strip_exe_from_cmdline=1
show_merged_command=1
tree_view=1
tree_view_always_by_pid=0
header_margin=1
screen_tabs=0
detailed_cpu_time=1
@ -40,17 +38,17 @@ column_meters_0=AllCPUs Memory Swap DiskIO NetworkIO
column_meter_modes_0=1 1 1 1 1
column_meters_1=Hostname Tasks LoadAverage Uptime DateTime
column_meter_modes_1=2 2 2 2 2
tree_view=1
sort_key=46
tree_view=0
sort_key=47
tree_sort_key=47
sort_direction=-1
tree_sort_direction=-1
tree_view_always_by_pid=0
all_branches_collapsed=0
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
.sort_key=PERCENT_CPU
.sort_key=PERCENT_MEM
.tree_sort_key=PERCENT_MEM
.tree_view=1
.tree_view=0
.tree_view_always_by_pid=0
.sort_direction=-1
.tree_sort_direction=-1