is github still complaining about a merge conflict

symfony · Apr 17, 2024 · 9e2c829 · 9e2c829
1 parent 80aafec
commit 9e2c829
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/config/makers.xml b/config/makers.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" ?>
 
-
-
-
 <container xmlns="http://symfony.com/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

diff --git a/src/Resources/config/maker.xml b/src/Resources/config/maker.xml