EZP-22152: removed a conflict marker

The beer's on me
ezsystems · Jan 29, 2014 · c99d7f5 · c99d7f5
1 parent 42fd762
commit c99d7f5
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/eZ/Bundle/EzPublishDebugBundle/Resources/views/Profiler/layout.html.twig b/eZ/Bundle/EzPublishDebugBundle/Resources/views/Profiler/layout.html.twig
@@ -121,4 +121,3 @@
         </table>
     {% endif %}
 {% endblock %}
->>>>>>> 4889995737ea7a28d1f0b072c9c6ef31463cad17