Revert "update to master"

This reverts commit fccb4bd29d
This commit is contained in:
zhaochengyi 2024-06-25 09:52:10 +00:00
parent fccb4bd29d
commit 7b8afb3024
107 changed files with 51641 additions and 35 deletions

View file

@ -1,5 +1,24 @@
if bashcompletiondir != 'no'
aliases = []
<<<<<<< HEAD
if get_option('daemon')
aliases += [
'pacmd',
'pasuspender',
]
endif
aliases += [
'pacat',
'pactl',
'padsp',
'paplay',
'parec',
'parecord',
]
=======
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
if get_option('daemon')
aliases += [