Fixed missed merge tag

This commit is contained in:
Duncan Ferguson 2011-07-28 21:32:04 +01:00
parent 4da6a909a5
commit 2af32a22d4

View file

@ -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};