remove resolved header in atnodes

agentzh · Aug 26, 2011 · 997ec59 · 997ec59
1 parent 6f89ec8
commit 997ec59
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/bin/atnodes b/bin/atnodes
@@ -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