diff options
Diffstat (limited to 'src/test/ui/parser/diff-markers/struct.rs')
| -rw-r--r-- | src/test/ui/parser/diff-markers/struct.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/test/ui/parser/diff-markers/struct.rs b/src/test/ui/parser/diff-markers/struct.rs deleted file mode 100644 index d26464d47bc..00000000000 --- a/src/test/ui/parser/diff-markers/struct.rs +++ /dev/null @@ -1,7 +0,0 @@ -struct S { -<<<<<<< HEAD //~ ERROR encountered diff marker - x: u8, -======= - x: i8, ->>>>>>> branch -} |