From da6f636c5f808e351e26f098f558ae427b3c53a6 Mon Sep 17 00:00:00 2001
From: staffadmin <stephane.gratiasquiquandon@gmail.com>
Date: Sun, 19 Nov 2023 14:43:51 +0100
Subject: [PATCH] test

---
 .gitea/workflows/build_ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitea/workflows/build_ci.yml b/.gitea/workflows/build_ci.yml
index 57406c8..ede6f8b 100644
--- a/.gitea/workflows/build_ci.yml
+++ b/.gitea/workflows/build_ci.yml
@@ -22,12 +22,8 @@ jobs:
 
       - name: Install nodejs and dnsutils (dig)for github action
         run:  |
-<<<<<<< HEAD
           apt-get update
           apt-get -y install nodejs dnsutils
-=======
-          apt-get -y install nodejs
->>>>>>> 9b6976d7582d7d097f31af36c02e562ef82ea903
 
       - name: Git clone private repo 
         uses: actions/checkout@v4