Revert "update to master"

This reverts commit fccb4bd29d

shell-completion/bash/meson.build

@@ -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 += [

shell-completion/bash/pactl

@@ -120,9 +120,15 @@ _pactl() {
                     set-default-sink set-sink-port get-default-source set-default-source
                     set-source-port get-sink-volume set-sink-volume get-source-volume
                     set-source-volume set-sink-input-volume set-source-output-volume
+<<<<<<< HEAD:shell-completion/bash/pulseaudio
+                    set-sink-mute set-source-mute set-sink-input-mute
+                    set-source-output-mute set-sink-formats set-port-latency-offset
+                    subscribe send-message help)
+=======
                     get-sink-mute set-sink-mute get-source-mute set-source-mute
                     set-sink-input-mute set-source-output-mute set-sink-formats
                     set-port-latency-offset subscribe send-message help)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336:shell-completion/bash/pactl
 
     _init_completion -n = || return
     preprev=${words[$cword-2]}