pt/tps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolver merge conflict

Browse Source
This commit is contained in:
Paul Trowbridge 2018-03-10 02:14:33 -05:00
parent b65174a24f
commit b190a39a8d
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deploy/ubm_schema.sql
View File

@ -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: -
--