Merge pull request #7303 from kenjis/fix-docs-filters.rst

docs: fix merge mistake in filters.rst

Author: kenjis

user_guide_src/source/incoming/filters.rst

@@ -161,12 +161,10 @@ a list of URI patterns that filter should apply to:
 
 .. literalinclude:: filters/009.php
 
-<<<<<<< HEAD
 .. _filters-filters-filter-arguments:
-=======
+
 Filter Arguments
 ================
->>>>>>> upstream/develop
 
 Filter Arguments
 ----------------