fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kcptun: fix conflict

Browse Source
This commit is contained in:
CN_SZTL 2020-01-21 20:11:39 +08:00
parent aa0b93b1d0
commit a2e91d6f15
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lean/kcptun/Makefile
View File

@ -72,7 +72,6 @@ define Package/$(PKG_NAME)-client/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/client_linux_$(PKG_ARCH_KCPTUN) $(1)/usr/bin/kcptun-client
endef
<<<<<<< HEAD
define Package/$(PKG_NAME)-server/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/server_linux_$(PKG_ARCH_KCPTUN) $(1)/usr/bin/kcptun-server
@ -80,6 +79,3 @@ endef
$(eval $(call BuildPackage,$(PKG_NAME)-client))
$(eval $(call BuildPackage,$(PKG_NAME)-server))
=======
$(eval $(call BuildPackage,$(PKG_NAME)))
>>>>>>> 46fc685ec42e327ffe8b4afd166321eacfd4290a