From 8cf7563ce4abbcf88dc5ebeb2c3910c76aa0b4e2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 24 Jun 2019 12:00:19 -0400
Subject: [PATCH] fix merge

---
 utils/do_debian_package.sh | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index ae09f98a8..7addf8362 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -124,7 +124,6 @@ else
   fi;
 fi
 
-<<<<<<< HEAD
 if [ "$PPA" == "" ]; then
   if [ "$RELEASE" != "" ]; then
     # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
@@ -140,22 +139,6 @@ if [ "$PPA" == "" ]; then
     else
       PPA="ppa:iconnor/zoneminder-$BRANCH";
     fi;
-=======
-PPA="";
-if [ "$RELEASE" != "" ]; then
-  # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
-  IFS='.' read -r -a VERSION <<< "$RELEASE"
-  if [ "${VERSION[0]}.${VERSION[1]}" == "1.30" ]; then
-    PPA="ppa:iconnor/zoneminder-stable"
-  else
-    PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}"
-  fi;
-else
-  if [ "$BRANCH" == "" ]; then
-    PPA="ppa:iconnor/zoneminder-master";
-  else 
-    PPA="ppa:iconnor/zoneminder-$BRANCH";
->>>>>>> acb95709e6cd8fdb9e76b3d58bc6f546fc6b1447
   fi;
 fi;
 
@@ -349,11 +332,8 @@ EOF
         dput $PPA $SC
       fi;
     else
-<<<<<<< HEAD
       echo "dputting to $PPA";
-=======
->>>>>>> acb95709e6cd8fdb9e76b3d58bc6f546fc6b1447
-        dput $PPA $SC
+      dput $PPA $SC
     fi;
   fi;
 done; # foreach distro
@@ -365,5 +345,3 @@ if [ "$INTERACTIVE" != "no" ]; then
 else 
   rm -fr "$DIRECTORY.orig"; echo "The checked out copy has been deleted";
 fi
-
-