fix merge conflicts

wizAmit · wizAmit · commit bcfd1f39e7dc · 2019-05-22T22:55:16.000+05:30
diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs
@@ -158,7 +158,6 @@ fn test_chunks_nth_back() {
     assert_eq!(c4.nth_back(1_000_000_000usize), None);
 }
 
-
 #[test]
 fn test_chunks_last() {
     let v: &[i32] = &[0, 1, 2, 3, 4, 5];

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,6 @@ fn test_chunks_nth_back() {`
`158`	`158`	`assert_eq!(c4.nth_back(1_000_000_000usize), None);`
`159`	`159`	`}`
`160`	`160`
`161`		`-`
`162`	`161`	`#[test]`
`163`	`162`	`fn test_chunks_last() {`
`164`	`163`	`let v: &[i32] = &[0, 1, 2, 3, 4, 5];`