revert changes

stitchdata · Jul 29, 2024 · 306cce1 · 306cce1
1 parent 15af16f
commit 306cce1
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/_data/taps/schemas/hubspot/v3/hubspot-v3-foreign-keys.yml b/_data/taps/schemas/hubspot/v3/hubspot-v3-foreign-keys.yml
@@ -450,8 +450,6 @@ tables:
       foreign-key: portalId
     - key: portalId
       foreign-key: changes.portalId
-<<<<<<< HEAD
-=======
 - table-name: owners
   join:
   - table-name: companies
@@ -510,7 +508,6 @@ tables:
       foreign-key: changes.portalId
     - key: remoteList.portalId
       foreign-key: changes.portalId
->>>>>>> parent of 66ea00e5 (Removed foreign key)
 - table-name: subscription_changes
   join:
   - table-name: companies