From 4bc200f839822ff47903dd75f759655c1ef776e4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 6 Apr 2016 08:38:10 -0400
Subject: [PATCH] fix merge

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

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c1f157d98..fc7008c14 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -326,11 +326,7 @@ Monitor::Monitor(
 	images( 0 ),
 	privacy_bitmask( NULL )
 {
-<<<<<<< HEAD
-	strncpy( name, p_name, sizeof(name) );
-=======
 	strncpy( name, p_name, sizeof(name)-1 );
->>>>>>> iconnor_video
 
 	strncpy( event_prefix, p_event_prefix, sizeof(event_prefix)-1 );
 	strncpy( label_format, p_label_format, sizeof(label_format)-1 );