diff options
| author | Niclas Eklund <[email protected]> | 2011-03-03 16:21:34 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-05-19 14:38:18 +0200 |
| commit | a23f044daea7526a649c788b1a81000d833b1a3e (patch) | |
| tree | a6ebf83cdd0a157b13d6c1e2b5836377ded9950f | |
| parent | 7bd8f67f619dc2bd626d85bb35519d03cf7ed4c0 (diff) | |
| download | otp-a23f044daea7526a649c788b1a81000d833b1a3e.tar.gz otp-a23f044daea7526a649c788b1a81000d833b1a3e.tar.bz2 otp-a23f044daea7526a649c788b1a81000d833b1a3e.zip | |
Resolved merge issue.
| -rw-r--r-- | lib/ssh/test/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile index fc88916e45..c143181720 100644 --- a/lib/ssh/test/Makefile +++ b/lib/ssh/test/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2004-2010. All Rights Reserved. +# Copyright Ericsson AB 2004-2011. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -115,11 +115,7 @@ release_spec: opt release_tests_spec: opt $(INSTALL_DIR) $(RELSYSDIR) $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR) -<<<<<<< HEAD $(INSTALL_DATA) ssh.spec ssh.cover $(RELSYSDIR) -======= - $(INSTALL_DATA) ssh.spec $(RELSYSDIR) ->>>>>>> Add test suite for ssh $(INSTALL_DATA) $(HRL_FILES_NEEDED_IN_TEST) $(RELSYSDIR) @for dir in $(DATA_DIRS); do \ if test ! -d $$dir ; then \ |