Removed merge ======= and reformatted code with prettier

This commit is contained in:
TheDarkBug 2021-04-16 10:52:28 +02:00
parent b3d4a8bfc9
commit 5ac94df5bf

View file

@ -285,7 +285,7 @@ void print_info()
if (show_resolution) if (show_resolution)
if (screen_width != 0 || screen_height != 0) if (screen_width != 0 || screen_height != 0)
printf("\033[18C%s%sRESOLUTION%s %dx%d\n", printf("\033[18C%s%sRESOLUTION%s %dx%d\n",
NORMAL, BOLD, NORMAL, screen_width, screen_height); NORMAL, BOLD, NORMAL, screen_width, screen_height);
if (show_shell) if (show_shell)
printf("\033[18C%s%sSHELL %s%s\n", printf("\033[18C%s%sSHELL %s%s\n",
NORMAL, BOLD, NORMAL, shell); NORMAL, BOLD, NORMAL, shell);
@ -293,7 +293,6 @@ void print_info()
printf("\033[18C%s%sPKGS %s%s%d %s\n", printf("\033[18C%s%sPKGS %s%s%d %s\n",
NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name); NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name);
if (show_uptime) if (show_uptime)
=======
#ifndef __APPLE__ #ifndef __APPLE__
printf("\033[18C%s%sUWUPTIME %s" /*"%lid, "*/ "%lih, %lim\n", printf("\033[18C%s%sUWUPTIME %s" /*"%lid, "*/ "%lih, %lim\n",
NORMAL, BOLD, NORMAL, /*sys.uptime/60/60/24,*/ sys.uptime / 60 / 60, sys.uptime / 60 % 60); NORMAL, BOLD, NORMAL, /*sys.uptime/60/60/24,*/ sys.uptime / 60 / 60, sys.uptime / 60 % 60);