summaryrefslogtreecommitdiff
path: root/src/test/rustdoc/sized_trait.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/rustdoc/sized_trait.rs')
-rw-r--r--src/test/rustdoc/sized_trait.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/test/rustdoc/sized_trait.rs b/src/test/rustdoc/sized_trait.rs
index 92b5c91b599..79c9f686e51 100644
--- a/src/test/rustdoc/sized_trait.rs
+++ b/src/test/rustdoc/sized_trait.rs
@@ -12,7 +12,6 @@ pub struct Foo<T: ?Sized>(T);
// @has foo/struct.Unsized.html
// @has - '//div[@id="impl-Sized-for-Unsized"]//h3[@class="code-header in-band"]' 'impl !Sized for Unsized'
->>>>>>> 083cf2a97a8... rustdoc: Add more semantic information to impl ids
pub struct Unsized {
data: [u8],
}