From 98a3d8f9f27889e168706e6f6e7e0660e0e38e8a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 22 Dec 2016 11:02:07 -0500
Subject: [PATCH] remove <<<< line

---
 scripts/zmwatch.pl.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 2eb928e73..bb0bd1e88 100644
--- 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) ) {