From ee924ba2436f792d60e8eb4a64a6dd1860c9f681 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 9 Jul 2020 13:35:15 -0500
Subject: [PATCH] resolve conflict

---
 etc/dm.deploy.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf
index 596086fb..1d1a25d8 100644
--- a/etc/dm.deploy.conf
+++ b/etc/dm.deploy.conf
@@ -14,11 +14,7 @@ DM_DAQ_WEB_SERVICE_URL=https://DM_HOSTNAME:33336
 DM_CAT_WEB_SERVICE_URL=https://DM_HOSTNAME:44436
 DM_PROC_WEB_SERVICE_URL=https://DM_HOSTNAME:55536
 DM_APS_DB_WEB_SERVICE_URL=https://DM_HOSTNAME:11236
-<<<<<<< HEAD
 DM_SOFTWARE_VERSION=3.3.2
-=======
-DM_SOFTWARE_VERSION=3.3.2
->>>>>>> master
 LDAP_SERVER_URL='ldaps://dmid-vm.xray.aps.anl.gov:636'
 LDAP_DN_FORMAT='uid=%%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'
 LDAP_UTIL_ADMIN_DN='uid=DM_SYSTEM_UNIX_ACCOUNT,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'
-- 
GitLab