From 0835c35e87ac410164931b9cd5f746b8e2cb5ae8 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Tue, 7 May 2024 14:55:37 +0300
Subject: [PATCH] merge

---
 compose.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/compose.yml b/compose.yml
index 966d182..698352b 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,12 +3,7 @@ services:
     build:
       dockerfile: Dockerfile
     environment:
-<<<<<<< HEAD
       - WEBHOOK=https://crm.svs-tech.pro/rest/1/liljl5r1k6dtxt0s/
-=======
-      - WEBHOOK='https://crm.svs-tech.pro/rest/1/liljl5r1k6dtxt0s/'
-      - TOKEN='7102273461:AAGi8RXCEvns2ONu3RcG9Up973vcLzTdCJg'
->>>>>>> 8e02e7e37e90109b71d0bcc7f46211f308e97edb
     ports:
       - 8099:80
     networks: