mirror of
https://github.com/duncs/clusterssh.git
synced 2025-04-22 09:22:24 +00:00
Fixed missed merge tag
This commit is contained in:
parent
4da6a909a5
commit
2af32a22d4
1 changed files with 0 additions and 1 deletions
|
@ -735,7 +735,6 @@ sub send_resizemove($$$$$) {
|
|||
sub setup_helper_script() {
|
||||
my($self) = @_;
|
||||
logmsg( 2, "Setting up helper script" );
|
||||
<<<<<<< HEAD
|
||||
my $comms=$self->config->{comms};
|
||||
my $comms_args=$self->config->{$self->config->{comms}.'_args'} || '';
|
||||
my $command=$self->config->{command};
|
||||
|
|
Loading…
Add table
Reference in a new issue