From cf2dff2b1e3fa55fa5415d524200070d0d7aacfe Mon Sep 17 00:00:00 2001 From: Albert Larsan <74931857+albertlarsan68@users.noreply.github.com> Date: Thu, 5 Jan 2023 09:13:28 +0100 Subject: Move /src/test to /tests --- src/test/ui/parser/diff-markers/struct-expr.rs | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 src/test/ui/parser/diff-markers/struct-expr.rs (limited to 'src/test/ui/parser/diff-markers/struct-expr.rs') diff --git a/src/test/ui/parser/diff-markers/struct-expr.rs b/src/test/ui/parser/diff-markers/struct-expr.rs deleted file mode 100644 index 99d2fd662c6..00000000000 --- a/src/test/ui/parser/diff-markers/struct-expr.rs +++ /dev/null @@ -1,12 +0,0 @@ -struct S { - x: u8, -} -fn main() { - let _ = S { -<<<<<<< HEAD //~ ERROR encountered diff marker - x: 42, -======= - x: 0, ->>>>>>> branch - } -} -- cgit 1.4.1-3-g733a5