From c11923692cd6ad91c39677a8c4e54afd79a4a124 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 11:34:55 +0900 Subject: [PATCH] docs: fix conflicts when rebasing --- user_guide_src/source/incoming/filters.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index b6082522cf6e..6c6b525ce838 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/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 ----------------