1 files changed, 0 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 83223667dc..e19c0d56d4 100644
--- a/Makefile
+++ b/Makefile
@@ -129,13 +129,8 @@ srcdist: distclean
 		>> $(TARGET_SRC_DIR)/INSTALL
 	cp README.in $(TARGET_SRC_DIR)/README
 	elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \
-<<<<<<< local
 		>> $(TARGET_SRC_DIR)/BUILD
 	sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in
-=======
-		>> $(TARGET_SRC_DIR)/README
-	sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit.app
->>>>>>> other
 
 	cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
 	cp codegen.py Makefile $(TARGET_SRC_DIR)