From 5351fc45105467d9bebd64828a1cf3566f32bab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Sun, 25 Feb 2024 19:27:31 +0100
Subject: [PATCH] fix merge

---
 scripts/_common.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 057469a..944a65e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,14 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-<<<<<<< HEAD
-=======
-YNH_PHP_VERSION="7.4"
-
-pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mbstring"
-#php${YNH_PHP_VERSION}-mcrypt
-
->>>>>>> testing
 #=================================================
 # PERSONAL HELPERS
 #=================================================