ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove <<<< line

This commit is contained in:
Isaac Connor 2016-12-22 11:02:07 -05:00
parent 0f4b78b180
commit 98a3d8f9f2
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/zmwatch.pl.in
View File

@ -93,7 +93,6 @@ while( 1 ) {
&& zmMemRead( $monitor, "shared_data:valid" ) && zmMemRead( $monitor, "shared_data:valid" )
) )
{ {
<<<<<<< HEAD
# Check we have got an image recently # Check we have got an image recently
my $image_time = zmGetLastWriteTime( $monitor ); my $image_time = zmGetLastWriteTime( $monitor );
if ( !defined($image_time) ) { if ( !defined($image_time) ) {