diff options
Diffstat (limited to 'src/test/ui/parser/diff-markers/item-with-attr.rs')
| -rw-r--r-- | src/test/ui/parser/diff-markers/item-with-attr.rs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/test/ui/parser/diff-markers/item-with-attr.rs b/src/test/ui/parser/diff-markers/item-with-attr.rs deleted file mode 100644 index 985907c08b2..00000000000 --- a/src/test/ui/parser/diff-markers/item-with-attr.rs +++ /dev/null @@ -1,10 +0,0 @@ -#[attribute] -<<<<<<< HEAD //~ ERROR encountered diff marker -fn foo() {} -======= -fn bar() {} ->>>>>>> branch - -fn main() { - foo(); -} |