Update borrowck_errors.rs

gaurikholkar · web-flow · commit c1192065ea02 · 2018-04-05T22:04:20.000+05:30
diff --git a/src/librustc_mir/util/borrowck_errors.rs b/src/librustc_mir/util/borrowck_errors.rs
@@ -284,12 +284,8 @@ pub trait BorrowckErrors<'cx>: Sized + Copy {
         self.cancel_if_wrong_origin(err, o)
     }
 
-<<<<<<< HEAD
     fn cannot_assign(&self, span: Span, desc: &str, o: Origin, is_reference:bool)
                      -> DiagnosticBuilder
-=======
-    fn cannot_assign(self, span: Span, desc: &str, o: Origin) -> DiagnosticBuilder<'cx>
->>>>>>> 56714acc5eb0687ed9a7566fdebe5528657fc5b3
     {
         let msg = if is_reference {
             "through"

Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,8 @@ pub trait BorrowckErrors<'cx>: Sized + Copy {`
`284`	`284`	`self.cancel_if_wrong_origin(err, o)`
`285`	`285`	`}`
`286`	`286`
`287`		`-<<<<<<< HEAD`
`288`	`287`	`fn cannot_assign(&self, span: Span, desc: &str, o: Origin, is_reference:bool)`
`289`	`288`	`-> DiagnosticBuilder`
`290`		`-=======`
`291`		`- fn cannot_assign(self, span: Span, desc: &str, o: Origin) -> DiagnosticBuilder<'cx>`
`292`		`->>>>>>> 56714acc5eb0687ed9a7566fdebe5528657fc5b3`
`293`	`289`	`{`
`294`	`290`	`let msg = if is_reference {`
`295`	`291`	`"through"`