resolve conflicts

Author: markzegarelli

src/_data/catalog/destination_categories.yml

@@ -1,5 +1,9 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
+<<<<<<< HEAD
 # destination categories last updated 2022-06-09 
+=======
+# destination categories last updated 2022-06-07 
+>>>>>>> master
 items:
 - display_name: A/B Testing
   slug: a-b-testing

src/_data/catalog/destinations.yml

@@ -1,5 +1,9 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
+<<<<<<< HEAD
 # destination data last updated 2022-06-09
+=======
+# destination data last updated 2022-06-07 
+>>>>>>> master
 items:
 - id: 60b5d0a01f3726b85dc05aab
   display_name: 2mee
@@ -32905,7 +32909,7 @@ items:
   settings:
   - name: isSandbox
     type: boolean
-    defaultValue: false
+    defaultValue: ''
     description: >-
       Enable to authenticate into a sandbox instance. You can log in to a
       sandbox by appending the sandbox name to your Salesforce username. For

src/_data/catalog/regional-supported.yml

@@ -1,5 +1,9 @@
 # AUTOGENERATED LIST OF CONNECTIONS THAT SUPPORT REGIONAL
+<<<<<<< HEAD
 # Last updated 2022-06-09
+=======
+# Last updated 2022-06-07 
+>>>>>>> master
 warehouses:
   - id: WcjBCzUGff
     display_name: Azure SQL Data Warehouse

src/_data/catalog/source_categories.yml

@@ -1,5 +1,9 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
+<<<<<<< HEAD
 # source cateogries last updated 2022-06-09 
+=======
+# source cateogries last updated 2022-06-07 
+>>>>>>> master
 items:
   - display_name: A/B Testing
     slug: a-b-testing

src/_data/catalog/sources.yml

@@ -1,5 +1,9 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
+<<<<<<< HEAD
 # sources last updated 2022-06-09 
+=======
+# sources last updated 2022-06-07 
+>>>>>>> master
 items:
   - id: 8HWbgPTt3k
     display_name: .NET