Fix merge conflict

markzegarelli · markzegarelli · commit 226270c7b8bd · 2022-05-31T08:26:44.000-07:00
diff --git a/src/_data/catalog/destinations.yml b/src/_data/catalog/destinations.yml
@@ -35124,11 +35124,7 @@ items:
   display_name: Skalin
   name: Skalin
   slug: skalin
-<<<<<<< HEAD
-  hidden: true
-=======
   hidden: false
->>>>>>> 5dbaf28c (Update Catalog to include Skalin)
   endpoints:
   - us
   regions:
