From e3d0903120375769bce8e2440de44fe60d61b20c Mon Sep 17 00:00:00 2001
From: Kyle Niewiada <kniewia@gmail.com>
Date: Fri, 29 Nov 2019 09:10:17 -0500
Subject: [PATCH] Fix rebase conflict

---
 config/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/config/config.yml b/config/config.yml
index b8742e505..6afa0e888 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -15,12 +15,6 @@ cameras:
       # values that begin with a "$" will be replaced with environment variable
       password: $RTSP_PASSWORD
       path: /cam/realmonitor?channel=1&subtype=2
-      ################
-      ## Optional URL format. Specifying this will override the default RTSP URL format.
-      ## Some cameras support the RTMP protocol which may give better performance. 
-      ################
-      # urlformat: rtmp://{host}:{port}{path}&user={user}&password={password}
-
 
     ################
     ## Optional URL format. Specifying this will override the default RTSP URL format.