From b190a39a8d50659952ff58b670634aac95164059 Mon Sep 17 00:00:00 2001
From: Paul Trowbridge <fleetside72@hotmail.com>
Date: Sat, 10 Mar 2018 02:14:33 -0500
Subject: [PATCH] resolver merge conflict

---
 deploy/ubm_schema.sql | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/deploy/ubm_schema.sql b/deploy/ubm_schema.sql
index 09ed52a..39c0d46 100644
--- a/deploy/ubm_schema.sql
+++ b/deploy/ubm_schema.sql
@@ -49,11 +49,6 @@ CREATE TYPE tps."DCARD" AS (
 COMMENT ON TYPE tps."DCARD" IS 'Discover Card';
 
 
-<<<<<<< HEAD
-=======
-
-
->>>>>>> master
 --
 -- Name: DMAPI; Type: TYPE; Schema: tps; Owner: -
 --