VACMS-14683: Updates composer.json

department-of-veterans-affairs · May 1, 2024 · 10c967c · 10c967c
1 parent 140b214
commit 10c967c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -223,11 +223,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-<<<<<<< HEAD
         "va-gov/content-build": "^0.0.3494",
-=======
-        "va-gov/content-build": "^0.0.3491",
->>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",