projects / feed / routing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3eb9aa3)
opennds: Release v10.1.2
authorRob White <rob@blue-wave.net>
Sun, 30 Jul 2023 20:02:17 +0000 (21:02 +0100)
committerJosef Schlehofer <pepe.schlehofer@gmail.com>
Mon, 31 Jul 2023 05:46:50 +0000 (07:46 +0200)
Reinstate CONFLICTS:=nodogsplash

Signed-off-by: Rob White <rob@blue-wave.net>
opennds/Makefile patch | blob | history

diff --git a/opennds/Makefile b/opennds/Makefile
index 5476aec7f578370fed996f079283ae1852269193..9e60280003a84913955c237fab0d3b69a8016ce9 100644 (file)
--- a/opennds/Makefile
+++ b/opennds/Makefile
@@ -30,6 +30,7 @@ define Package/opennds
   DEPENDS:=+libmicrohttpd-no-ssl
   TITLE:=open Network Demarcation Service
   URL:=https://github.com/opennds/opennds
+  CONFLICTS:=nodogsplash
 endef
 
 define Package/opennds/description
Mirror of routing feed