11 lines
133 B
Rust
11 lines
133 B
Rust
|
#[attribute]
|
||
|
<<<<<<< HEAD //~ ERROR encountered diff marker
|
||
|
fn foo() {}
|
||
|
=======
|
||
|
fn bar() {}
|
||
|
>>>>>>> branch
|
||
|
|
||
|
fn main() {
|
||
|
foo();
|
||
|
}
|