remove <<<< line

2016-12-22 11:02:07 -05:00 · 2016-12-22 11:02:07 -05:00 · 98a3d8f9f2
parent 0f4b78b180
commit 98a3d8f9f2
1 changed files with 0 additions and 1 deletions
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@ -93,7 +93,6 @@ while( 1 ) {
        && zmMemRead( $monitor, "shared_data:valid" )
       )
    {
-<<<<<<< HEAD
 # Check we have got an image recently
      my $image_time = zmGetLastWriteTime( $monitor );
      if ( !defined($image_time) ) {