last merge conflict

fivetran · Nov 28, 2023 · 39f93ab · 39f93ab
1 parent e052952
commit 39f93ab
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -6,11 +6,7 @@ version: '0.13.0'
 profile: 'integration_tests'
 
 vars:
-<<<<<<< HEAD
   zendesk_schema: zendesk_integration_tests_40
-=======
-  zendesk_schema: zendesk_integration_tests_3
->>>>>>> release/v0.13.0
   zendesk_source:
     zendesk_organization_identifier:           "organization_data"
     zendesk_schedule_identifier:               "schedule_data"