Fix json.

sterner-stuff · May 23, 2024 · 011e3eb · 011e3eb
1 parent a873822
commit 011e3eb
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -61,7 +61,6 @@
     "oscarotero/env": "^2.1",
     "roots/bedrock-autoloader": "^1.0",
     "roots/bedrock-disallow-indexing": "^2.0",
-<<<<<<< HEAD
     "roots/wordpress": "^6.5.3",
     "roots/wp-config": "^1.0.0",
     "roots/wp-password-bcrypt": "^1.1.0",