From d6f291fa3cdd262136b074a874d4ce6b35f69eef Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Wed, 1 May 2019 19:39:16 +0200
Subject: [PATCH] fixed composer.lock

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

diff --git a/composer.lock b/composer.lock
index e0a8df1..b503872 100644
--- a/composer.lock
+++ b/composer.lock
@@ -14211,21 +14211,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-<<<<<<< HEAD
-                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
-                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
-=======
                 "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
                 "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
->>>>>>> master
                 "shasum": ""
             },
             "require": {