From a23f044daea7526a649c788b1a81000d833b1a3e Mon Sep 17 00:00:00 2001
From: Niclas Eklund <nick@erlang.org>
Date: Thu, 3 Mar 2011 16:21:34 +0100
Subject: Resolved merge issue.

---
 lib/ssh/test/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib/ssh/test/Makefile')

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 \
-- 
cgit v1.2.3