aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/ssh/test/Makefile6
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 \