From a05560e7979db08b3776b6c25e1edd00390261ce Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Sep 2021 09:30:29 -0400
Subject: [PATCH] fix merge of version

---
 version | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/version b/version
index fdf2cd02b..9cf86ad0f 100644
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1.35.18
-=======
 1.37.1
->>>>>>> 97c10fc135ebe46d8a9f1df2e21b85fb95a91cb9