Merge commit 'origin/master' into HEAD

[urisagit/Stem.git] / bin / chat2_demo

diff --git a/bin/chat2_demo b/bin/chat2_demo
index b23a14f..1340a79 100755 (executable)
--- a/bin/chat2_demo
+++ b/bin/chat2_demo
@@ -7,7 +7,10 @@ $xskip = ( $^O eq 'solaris' ) ? 600 : 500 ;
 
 use File::Basename qw( basename );
 $ENV{PATH} .= ':' . basename( $0 ) . ':.';
+<<<<<<< HEAD:bin/chat2_demo
+=======
 
+>>>>>>> origin/master:bin/chat2_demo
 for my $prog qw( run_stem xterm telnet ) {
     die "Can't find $prog in PATH\n" if
         system( "which $prog >/dev/null 2>&1" ) != 0;