From cc3bb7b68a2e7e43b244a00c4ff96d14b74de251 Mon Sep 17 00:00:00 2001
From: Ben Striegel <ben.striegel@gmail.com>
Date: Tue, 29 Jan 2013 22:41:04 -0500
Subject: [PATCH] What, no syntax for mutable borrowed region pointers?

---
 src/libcore/vec.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index 52b62d10a204..7e8dcf72d0fb 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -280,12 +280,8 @@ pub pure fn view<T>(v: &r/[T], start: uint, end: uint) -> &r/[T] {
 }
 
 /// Return a slice that points into another slice.
-<<<<<<< HEAD
 #[inline(always)]
 pub pure fn mut_view<T>(v: &r/[mut T], start: uint, end: uint) -> &r/[mut T] {
-=======
-pub pure fn mut_view<T>(v: &mut r/[T], start: uint, end: uint) -> &mut r/[T] {
->>>>>>> RIMOV, round 11
     assert (start <= end);
     assert (end <= len(v));
     do as_mut_buf(v) |p, _len| {