From 6ec9302f8d15b327d2de3177b3a433ad30332888 Mon Sep 17 00:00:00 2001
From: Louis Poinsignon <louis@cloudflare.com>
Date: Mon, 23 Nov 2020 18:18:57 -0800
Subject: [PATCH] fix Makefile bad merge

---
 Makefile | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/Makefile b/Makefile
index c754f6a..74a2897 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,6 @@ docker-rtrmon:
 .PHONY: package-deb-gortr
 package-deb-gortr: prepare
 	fpm -s dir -t deb -n $(GORTR_NAME) -v $(VERSION_PKG) \
-<<<<<<< HEAD
         --description "$(DESCRIPTION)"  \
         --url "$(URL)" \
         --architecture $(ARCH) \
@@ -82,20 +81,6 @@ package-deb-gortr: prepare
         cmd/gortr/cf.pub=/usr/share/gortr/cf.pub \
         $(OUTPUT_RTRDUMP)=/usr/bin/rtrdump \
         $(OUTPUT_RTRMON)=/usr/bin/rtrmon
-=======
-	--description "$(DESCRIPTION)"  \
-	--url "$(URL)" \
-	--architecture $(ARCH) \
-	--license "$(LICENSE)" \
-	--deb-no-default-config-files \
-	--package $(DIST_DIR) \
-	$(OUTPUT_GORTR)=/usr/bin/gortr \
-	package/gortr.service=/lib/systemd/system/gortr.service \
-	package/gortr.env=/etc/default/gortr \
-	cmd/gortr/cf.pub=/usr/share/gortr/cf.pub \
-	$(OUTPUT_RTRDUMP)=/usr/bin/rtrdump \
-	$(OUTPUT_RTRMON)=/usr/bin/rtrmon
->>>>>>> fix indentation
 
 .PHONY: package-rpm-gortr
 package-rpm-gortr: prepare