From 825cf2cb27bcb9c2d27d9fa46d8c73565653d63e Mon Sep 17 00:00:00 2001
From: Eric Allam <eallam@icloud.com>
Date: Fri, 30 Dec 2022 10:16:19 +0000
Subject: [PATCH] Move ngrok to docker compose

---
 apps/webapp/integrations.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/webapp/integrations.yml b/apps/webapp/integrations.yml
index 9c73c4a6d..267d1e1f6 100644
--- a/apps/webapp/integrations.yml
+++ b/apps/webapp/integrations.yml
@@ -13,12 +13,9 @@
 - name: Slack
   slug: slack
   icon: /integrations/slack.png
-<<<<<<< HEAD
   scopes:
     - channels:read
     - chat:write:bot
-=======
->>>>>>> 2bc66f0 (Setup the slack integration)
   environments:
     development:
       oauth: