diff options
Diffstat (limited to 'src/test/ui/parser/diff-markers/use-statement.rs')
| -rw-r--r-- | src/test/ui/parser/diff-markers/use-statement.rs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/test/ui/parser/diff-markers/use-statement.rs b/src/test/ui/parser/diff-markers/use-statement.rs deleted file mode 100644 index 6306243a514..00000000000 --- a/src/test/ui/parser/diff-markers/use-statement.rs +++ /dev/null @@ -1,9 +0,0 @@ -use foo::{ -<<<<<<< HEAD //~ ERROR encountered diff marker - bar, -======= - baz, ->>>>>>> branch -}; - -fn main() {} |