commit 274d85c874e6326252a7ff8e7cc978ad6381390e
Merge: ade6575 5483532
Author: Raniconduh <clagv.randomgames@gmail.com>
Date: Mon Apr 04 11:46:44 2022 +0000
fix off-by-one error in colors
diff --cc src/opts.c
index c7b50d0,f4af8d8..b0b6292
--- a/src/opts.c
+++ b/src/opts.c
@@@ -160,14 -159,14 +160,27 @@@ 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;
+ custom_colors[COLOR_SOCK] = sock_color;
+ custom_colors[COLOR_FIFO] = fifo_color;
+ custom_colors[COLOR_UNKNOWN] = unknown_color;
+ custom_colors[COLOR_FILE] = reg_color;
+ 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
}
