From d997a29169a2274a3ef27aa5b698a171f0658923 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 18 Jan 2022 15:41:57 +0100
Subject: [PATCH] Small changes

---
 .config/htop/htoprc | 39 ---------------------------------------
 .tmux.conf          |  4 ----
 2 files changed, 43 deletions(-)
 delete mode 100644 .config/htop/htoprc

diff --git a/.config/htop/htoprc b/.config/htop/htoprc
deleted file mode 100644
index c1c50f3..0000000
--- a/.config/htop/htoprc
+++ /dev/null
@@ -1,39 +0,0 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 38 39 40 2 46 47 49 1
-sort_key=46
-sort_direction=1
-tree_sort_key=0
-tree_sort_direction=1
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=0
-show_thread_names=0
-show_program_path=0
-highlight_base_name=0
-highlight_megabytes=1
-highlight_threads=1
-highlight_changes=0
-highlight_changes_delay_secs=5
-find_comm_in_cmdline=1
-strip_exe_from_cmdline=1
-show_merged_command=0
-tree_view=0
-tree_view_always_by_pid=0
-header_margin=1
-detailed_cpu_time=0
-cpu_count_from_one=1
-show_cpu_usage=1
-show_cpu_frequency=0
-show_cpu_temperature=0
-degree_fahrenheit=0
-update_process_names=0
-account_guest_in_cpu_meter=0
-color_scheme=0
-enable_mouse=1
-delay=15
-left_meters=LeftCPUs2 Memory Swap
-left_meter_modes=1 1 1
-right_meters=RightCPUs2 Tasks LoadAverage Uptime
-right_meter_modes=1 2 2 2
-hide_function_bar=0
diff --git a/.tmux.conf b/.tmux.conf
index 12845ba..88c4f5e 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,6 +1,3 @@
-<<<<<<< Updated upstream
-set -s escape-time 0
-=======
 # Change prefix to Ctrl-a
 unbind C-b
 set -g prefix C-a
@@ -24,4 +21,3 @@ bind h select-pane -L
 bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
->>>>>>> Stashed changes