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 | e94eeb60d2fb7907eb3a44fe86b10ef5c590e308 (patch) | |
| tree | 4de951d8f43f6d9d1ce5eeaa2b9616ec3e613732 | |
| parent | 51b19aaff21998a54870db8ba893ee10a9531779 (diff) | |
| download | rabbitmq-server-git-e94eeb60d2fb7907eb3a44fe86b10ef5c590e308.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) |