From 2339ab58e819a76bad3364cfe7e672edc5c37a9d Mon Sep 17 00:00:00 2001 From: ACwifidude Date: Thu, 13 Oct 2022 08:36:11 -0500 Subject: [PATCH] Add NSS Package Feed --- feeds.conf.default | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/feeds.conf.default b/feeds.conf.default index d467db5627..ef76ed8869 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,12 @@ +<<<<<<< HEAD src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05 src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05 src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05 +======= +src-git-full packages https://git.openwrt.org/feed/packages.git;openwrt-23.05 +src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-23.05 +src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-23.05 +src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05 +src-git nss https://github.com/qosmio/nss-packages.git;NSS-11.2-K5.15 +>>>>>>> 19845846d5 (Add NSS Package Feed)