fix conflicts

Author: markzegarelli

src/_data/catalog/destination_categories.yml

@@ -1,9 +1,5 @@
 # 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,9 +1,5 @@
 # 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
@@ -15296,7 +15292,7 @@ items:
   actions: []
   presets: []
 - id: 62945b73b8fbe38be7718039
-  display_name: Freshsales Suite - CRM
+  display_name: Freshsales Suite-CRM
   name: Freshsales Suite - CRM
   slug: freshsales-suite-crm
   hidden: false

src/_data/catalog/regional-supported.yml

@@ -1,9 +1,5 @@
 # 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,9 +1,5 @@
 # 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,9 +1,5 @@
 # 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