fix merge

Author: xabbuh

Tests/DependencyInjection/Fixtures/xml/lock.xml

@@ -8,8 +8,6 @@
     <framework:config http-method-override="false" handle-all-throwables="true">
         <framework:annotations enabled="false" />
         <framework:php-errors log="true" />
-        <framework:lock>
-            <framework:resource>semaphore</framework:resource>
-        </framework:lock>
+        <framework:lock />
     </framework:config>
 </container>