From ec1f0d87af8f90b9a892570c6fb2153905183f1b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 18 Jan 2022 20:20:38 -0500
Subject: [PATCH] fix HEAD left behind

---
 src/zm_monitor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index fd16d3166..9194aa62a 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -77,7 +77,6 @@ struct Namespace namespaces[] =
 // This is the official SQL (and ordering of the fields) to load a Monitor.
 // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
 std::string load_monitor_sql =
-<<<<<<< HEAD
 "SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Capturing`+0, `Analysing`+0, `AnalysisSource`, `Recording`+0, `RecordingSource`, `DecodingEnabled`, "
 "`JanusEnabled`,"
 "`LinkedMonitors`, `EventStartCommand`, `EventEndCommand`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"