fix compilation error

2026-03-03 23:42:18 -05:00
parent f96277ef71
commit 7f776f279b
1 changed files with 1 additions and 6 deletions
@@ -28,13 +28,8 @@ int setupsound()
    pa_threaded_mainloop_lock(mainloop);

    // Start the mainloop
-<<<<<<< Updated upstream
-    assert(pa_threaded_mainloop_start(mainloop) == 0);
-    assert(pa_context_connect(context, NULL, 0, NULL) == 0);
-=======
    pa_threaded_mainloop_start(mainloop);
-    pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL);
->>>>>>> Stashed changes
+    pa_context_connect(context, NULL, 0, NULL);

    // Wait for the context to be ready
    for(;;) {