Merge

eslint · Jan 29, 2024 · 051f424 · 051f424
1 parent f6ff00f
commit 051f424
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/docs/src/use/formatters/index.md b/docs/src/use/formatters/index.md
@@ -807,12 +807,7 @@ Example output:
 
 ```text
 
-<<<<<<< HEAD
-C:\projects\eslint\fullOfProblems.js
-
-=======
 /var/lib/jenkins/workspace/eslint Release/eslint/fullOfProblems.js
->>>>>>> upstream/main
   1:10  error    'addOne' is defined but never used            no-unused-vars
   2:9   error    Use the isNaN function to compare with NaN    use-isnan
   3:16  error    Unexpected space before unary operator '++'   space-unary-ops