Fix lockfile

2020-02-05 15:45:37 -05:00 · 2020-02-05 15:45:37 -05:00 · 6cead61796
commit 6cead61796
parent afd6560db4
1 changed files with 0 additions and 4 deletions
--- a/composer.lock
+++ b/composer.lock
@ -1487,11 +1487,7 @@
        },
        {
            "name": "symfony/yaml",
-<<<<<<< HEAD
            "version": "v5.0.4",
-=======
-            "version": "v5.0.3",
->>>>>>> 60b1cca69588ba4af02246586f5e3c86eeeddd65
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",