Merge pull request #2555 from rust-lang/Centril-patch-1

Centril · web-flow · commit d1c11d8f3385 · 2018-10-04T17:41:05.000+02:00
RFC 1268, fix feature name
diff --git a/text/1268-allow-overlapping-impls-on-marker-traits.md b/text/1268-allow-overlapping-impls-on-marker-traits.md
@@ -1,4 +1,4 @@
-- Feature Name: Allow overlapping impls for marker traits
+- Feature Name: `overlapping_marker_traits`
 - Start Date: 2015-09-02
 - RFC PR: [rust-lang/rfcs#1268](https://github.com/rust-lang/rfcs/pull/1268)
 - Rust Issue: [rust-lang/rust#29864](https://github.com/rust-lang/rust/issues/29864)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-- Feature Name: Allow overlapping impls for marker traits`
	`1`	+- Feature Name: `overlapping_marker_traits`
`2`	`2`	`- Start Date: 2015-09-02`
`3`	`3`	`- RFC PR: [rust-lang/rfcs#1268](https://github.com/rust-lang/rfcs/pull/1268)`
`4`	`4`	`- Rust Issue: [rust-lang/rust#29864](https://github.com/rust-lang/rust/issues/29864)`