commit c036e1644de882a2fecff3494217ecfac7517305
Author: Raniconduh <clagv.randomgames@gmail.com>
Date: Mon Apr 04 19:12:40 2022 +0000
remove conflict marker
diff --git a/src/opts.c b/src/opts.c
index b0b6292..c7b50d0 100644
--- a/src/opts.c
+++ b/src/opts.c
@@ -1607 +1606 @@ void terminate_opts(void) {
void generate_colors(void) {
-<<<<<<< HEAD
custom_colors[COLOR_DIR] = dir_color;
custom_colors[COLOR_LINK] = link_color;
custom_colors[COLOR_EXEC] = exec_color;
@@ -17116 +1704 @@ void generate_colors(void) {
custom_colors[COLOR_BLOCK] = blk_color;
custom_colors[COLOR_MEDIA] = media_color;
custom_colors[COLOR_ARCHIVE] = archive_color;
-=======
- custom_colors[0] = dir_color;
- custom_colors[1] = link_color;
- custom_colors[2] = exec_color;
- custom_colors[3] = sock_color;
- custom_colors[4] = fifo_color;
- custom_colors[5] = unknown_color;
- custom_colors[6] = reg_color;
- custom_colors[7] = blk_color;
- custom_colors[8] = media_color;
- custom_colors[9] = archive_color;
->>>>>>> 5483532a992c59332581fa989f12b47b2e0ce4a0
}
