mirrors/mbp-manjaro
mirrors
/
mbp-manjaro
mirror of https://github.com/JPyke3/mbp-manjaro
1
0
Fork 0
Code Issues Releases Wiki Activity

resolve conflict

This commit is contained in:
Bernhard Landauer 2018-05-07 21:11:58 +02:00
parent 442ba5854e
commit fc545333fc
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
community/awesome/profile.conf
View File

@ -24,7 +24,7 @@ chrootcfg="false"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'avahi-daemon' 'add-autologin-group')
enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'avahi-daemon' 'add-autologin-group' 'haveged')
disable_systemd=('pacman-init')
# unset defaults to given values,

2
community/bspwm-mate/profile.conf
View File

@ -24,7 +24,7 @@ chrootcfg="false"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group')
enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged')
disable_systemd=('pacman-init')
# unset defaults to given values,

2
community/bspwm/profile.conf
View File

@ -24,7 +24,7 @@ chrootcfg="false"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root')
enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'haveged')
disable_systemd=('pacman-init')
# unset defaults to given values,

2
community/budgie/profile.conf
View File

@ -33,7 +33,7 @@ displaymanager="lightdm"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group')
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged')
# disable_systemd=()
# unset defaults to given values,

2
community/lxde/profile.conf
View File

@ -36,7 +36,7 @@ geoip="true"
# unset defaults to given values
# names must match systemd service names
# enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw')
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'haveged')
disable_systemd=('pacman-init')
# unset defaults to given values,

2
community/lxqt/profile.conf
View File

@ -42,7 +42,7 @@ chrootcfg="true"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep')
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'haveged')
# disable_systemd=('pacman-init')

2
community/mate/profile.conf
View File

@ -34,7 +34,7 @@ displaymanager="lightdm"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group')
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged')
# disable_systemd=()
# unset defaults to given values,

2
community/openbox/profile.conf
View File

@ -33,7 +33,7 @@ geoip='true'
# unset defaults to given values
# names must match systemd service names
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged')
disable_systemd=('pacman-init')
# unset defaults to given values,

2
community/webdad/profile.conf
View File

@ -32,7 +32,7 @@ extra="true"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'irqbalance' 'preload' 'ufw')
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'irqbalance' 'preload' 'ufw' 'haveged')
disable_systemd=('pacman-init')
# unset defaults to given values,