From 62319398226859163e6c1d98a40bf1139b854bf3 Mon Sep 17 00:00:00 2001
From: Grische <github@grische.xyz>
Date: Thu, 13 Jun 2024 15:35:17 +0200
Subject: [PATCH]  BACKPORT-CONFLICT

---
 modules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules b/modules
index 74c04797..253effad 100644
--- a/modules
+++ b/modules
@@ -24,5 +24,9 @@ PACKAGES_SSIDCHANGER_COMMIT=f266b9e6328f97354f3b8777d1111ad044be9be5
 # ffmuc-mesh-vpn-wireguard-vxlan
 # ffmuc-ipv6-ra-filter
 PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
+<<<<<<< HEAD
 PACKAGES_COMMUNITY_COMMIT=8f0a9dc2a631c5e1a640fe1d8afc7470be34065a
+=======
+PACKAGES_COMMUNITY_COMMIT=961897fd1bcebd6d0265707187131149abb0f498
+>>>>>>> f88a739 (modules: ffmuc-mesh-vpn-wireguard improve nslookup)
 PACKAGES_COMMUNITY_BRANCH=master