Permalink
Browse files

remove resolved header in atnodes

  • Loading branch information...
1 parent 6f89ec8 commit 997ec599cc237d93a4e44cca9a259a8a8bdb015b @liseen liseen committed Aug 26, 2011
Showing with 0 additions and 3 deletions.
  1. +0 −3 bin/atnodes
View
@@ -315,7 +315,6 @@ _EOC_
}
}
-<<<<<<< HEAD
sub check_openssh_version ($) {
my $ssh_cmd = shift;
@@ -328,8 +327,6 @@ sub check_openssh_version ($) {
}
}
-=======
->>>>>>> 94cfb1830ce1483c564184835923436b1e4bdfce
__END__
=encoding utf-8

0 comments on commit 997ec59

Please sign in to comment.