2022-12-28 20:26:59 -06:00
|
|
|
enum E {
|
|
|
|
Foo {
|
|
|
|
<<<<<<< HEAD //~ ERROR encountered diff marker
|
|
|
|
x: u8,
|
2022-12-28 22:55:46 -06:00
|
|
|
|||||||
|
|
|
|
z: (),
|
2022-12-28 20:26:59 -06:00
|
|
|
=======
|
2022-12-28 22:55:46 -06:00
|
|
|
y: i8,
|
2022-12-28 20:26:59 -06:00
|
|
|
>>>>>>> branch
|
|
|
|
}
|
|
|
|
}
|