remove the <<<<<r69901

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6999 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2010-08-09 02:10:24 +00:00
parent 7ba02f830d
commit 688cd70842

View File

@ -1387,5 +1387,4 @@ sub handle_deps()
return $nodeseq;
}
>>>>>>> .r6990
1;