From 489a16287b09f9f1153f57ba226304130479b83b Mon Sep 17 00:00:00 2001 From: ligc Date: Thu, 24 Jul 2014 16:56:15 -0500 Subject: [PATCH] fix for bug 4119: add comments for postscripts confignics/configeth/configib --- xCAT/postscripts/configeth | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth index 2c39fce2f..d76cd8d35 100755 --- a/xCAT/postscripts/configeth +++ b/xCAT/postscripts/configeth @@ -1,17 +1,4 @@ #!/bin/bash -<<<<<<< HEAD - -# IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html - -#------------------------------------------------------------------------------- -# configeth -# Internal script used by confignics only. It configs the Ethernet adpaters on the node -# -#------------------------------------------------------------------------------- - -str_dir_name=`dirname $0` -======= ->>>>>>> 08d923735c2c134b7bcd2a2b976706c10bc2f1cc f [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then