docs: fix conflicts when rebasing

codeigniter4 · Feb 24, 2023 · c119236 · c119236
1 parent d114378
commit c119236
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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
 ----------------