From 47705af70746c7c05fb4a5ca81a03ba30cdc7692 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 5 Mar 2026 13:51:43 -0500
Subject: [PATCH] Update direwolf.conf resolve merge conflict

---
 groundstation/direwolf/direwolf.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groundstation/direwolf/direwolf.conf b/groundstation/direwolf/direwolf.conf
index 3b372144..7bf93998 100644
--- a/groundstation/direwolf/direwolf.conf
+++ b/groundstation/direwolf/direwolf.conf
@@ -1 +1 @@
-ADEVICE plughw:CARD=Loopback,DEV=1 
+ADEVICE plughw:CARD=Loopback,DEV=1