mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-24 07:44:10 +00:00
10 lines
120 B
Rust
10 lines
120 B
Rust
|
<<<<<<< HEAD //~ ERROR encountered diff marker
|
||
|
|
fn foo() {}
|
||
|
|
=======
|
||
|
|
fn bar() {}
|
||
|
|
>>>>>>> branch
|
||
|
|
|
||
|
|
fn main() {
|
||
|
|
foo();
|
||
|
|
}
|