From a2e91d6f15f2d1e6508e455ab4b934066837a132 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Tue, 21 Jan 2020 20:11:39 +0800
Subject: [PATCH] kcptun: fix conflict

---
 package/lean/kcptun/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/lean/kcptun/Makefile b/package/lean/kcptun/Makefile
index d149fc415a..c567f04454 100644
--- a/package/lean/kcptun/Makefile
+++ b/package/lean/kcptun/Makefile
@@ -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