From 20f050044be59c3a0b977c10b0784a1cbddf843b Mon Sep 17 00:00:00 2001
From: Flavio Barachino <flavio.barachino@gmail.com>
Date: Mon, 12 Jun 2023 10:48:25 +0200
Subject: [PATCH] risolto divergenze composer.json e composer.lock

---
 composer.lock | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/composer.lock b/composer.lock
index 47d58cc..db84f33 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9149,7 +9149,6 @@
         },
         {
             "name": "phpunit/phpunit",
-<<<<<<< HEAD
             "version": "9.6.8",
             "source": {
                 "type": "git",
@@ -9160,18 +9159,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
                 "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
-=======
-            "version": "9.6.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
-                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
                 "shasum": ""
             },
             "require": {