blob: e55d16d3bbb8eb112b7167aa0d4ce457ffd41264 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
trait T {
fn foo() {}
fn bar() {}
}
struct S;
impl T for S {}
fn main() {
<<<<<<< HEAD //~ ERROR encountered diff marker
S::foo();
=======
S::bar();
>>>>>>> branch
}
|