fix upstream-pull conflict

ferrocene · Oct 31, 2023 · a39884b · a39884b
1 parent d9c5176
commit a39884b
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/tests/ui/parser/doc-comment-in-stmt.rs b/tests/ui/parser/doc-comment-in-stmt.rs
@@ -20,15 +20,11 @@ fn quux() -> i32 {
     //~^ ERROR found doc comment
 }
 
-<<<<<<< HEAD
-fn main() {}
-
-// ferrocene-annotations: fls_q8l2jza7d9xa
-// Comments
-=======
 fn main() {
     let x = 0;
     let y = x.max(1) //!foo //~ ERROR found doc comment
         .min(2);
 }
->>>>>>> pull-upstream-temp--do-not-use-for-real-code
+
+// ferrocene-annotations: fls_q8l2jza7d9xa
+// Comments