fix feeds

This commit is contained in:
ACwifidude
2023-07-09 16:13:34 -04:00
parent 870f2dd1d9
commit 89b2ec9c2d

View File

@@ -1,12 +1,5 @@
<<<<<<< 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)
src-git nss https://github.com/ACwifidude/nss-packages.git;NSS-11.2-K5.15