From 64bbf70b6363cd5d3aee34fc995c8b9b6d207dd3 Mon Sep 17 00:00:00 2001
From: Eugene Sylenko <1863154+ffenix113@users.noreply.github.com>
Date: Wed, 24 Jan 2024 01:17:12 +0100
Subject: [PATCH] fix merge

---
 .github/workflows/docs.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 8d48263..7642b89 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,9 +1,6 @@
 name: Docs
 on:
-<<<<<<< HEAD
   workflow_dispatch:
-=======
->>>>>>> 4b6e3d3 (update workflow to add push condition)
   push:
     branches:
       - main