From e5030ff998a33752feb9ec230abfa61970ad7bf3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 May 2017 13:39:03 -0400
Subject: [PATCH] fix version

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

diff --git a/version b/version
index d230fb9ee..34aae156b 100644
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 1.31.0
-=======
-1.30.4
->>>>>>> master