Merge remote-tracking branch 'office/master'

This commit is contained in:
Geoffrey Frogeye 2021-12-02 10:58:11 +01:00
commit 3ff188c80b
2 changed files with 2 additions and 2 deletions

View file

@ -30,7 +30,7 @@ then
fi fi
# If we have junest installed DE try them before all others # If we have junest installed DE try them before all others
sessions_dir_junest="$HOME/.local/share/xsessions" sessions_dir_junest="$HOME/.junest/usr/share/xsessions"
if [ -d "$sessions_dir_junest" ] if [ -d "$sessions_dir_junest" ]
then then
sessions_dirs="$sessions_dir_junest $sessions_dirs" sessions_dirs="$sessions_dir_junest $sessions_dirs"

View file

@ -6,7 +6,7 @@
# Sourced by display managers # Sourced by display managers
# #
. ~/.xprofile [ -f ~/.xprofile ] && . ~/.xprofile
if [ -f ~/.config/override_dm_choice ] if [ -f ~/.config/override_dm_choice ]
then then
. ~/.config/xinitrc . ~/.config/xinitrc