amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-07-03 18:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed missed merge tag

Browse source
This commit is contained in:
Duncan Ferguson 2011-07-28 21:32:04 +01:00
parent 4da6a909a5
commit 2af32a22d4
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/App/ClusterSSH.pm
View file

@ -735,7 +735,6 @@ sub send_resizemove($$$$$) {
sub setup_helper_script() { sub setup_helper_script() {
my($self) = @_; my($self) = @_;
logmsg( 2, "Setting up helper script" ); logmsg( 2, "Setting up helper script" );
<<<<<<< HEAD
my $comms=$self->config->{comms}; my $comms=$self->config->{comms};
my $comms_args=$self->config->{$self->config->{comms}.'_args'} || ''; my $comms_args=$self->config->{$self->config->{comms}.'_args'} || '';
my $command=$self->config->{command}; my $command=$self->config->{command};