X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=bin%2Fchat2_demo;fp=bin%2Fchat2_demo;h=1340a79fd865ade99727a7663bc01fe42cb3ad3a;hb=c0baaa7d3112ec2b6d1561fe62bdf9e46a808b42;hp=b23a14fba2d1c9b2a47ab5648269cb5a38f3eda6;hpb=6b34fa6632989ffe8ce2ff3f9bf8ae7838e03062;p=urisagit%2FStem.git

diff --git a/bin/chat2_demo b/bin/chat2_demo
index b23a14f..1340a79 100755
--- 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;