diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2009-01-21 13:18:34 +0000 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2009-01-21 13:18:34 +0000 |
| commit | 60ddc29695d13c8ad356cdbf18da8718d6e4952f (patch) | |
| tree | 4de951d8f43f6d9d1ce5eeaa2b9616ec3e613732 | |
| parent | 61905afe297345f56fb7341e0755f6e7cb1f1020 (diff) | |
| download | rabbitmq-server-60ddc29695d13c8ad356cdbf18da8718d6e4952f.tar.gz | |
Bad conflict resolution
| -rw-r--r-- | Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -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) |