Update borrowck_errors.rs

2018-04-05 22:04:20 +05:30 · 2018-04-05 22:04:20 +05:30 · c1192065ea
commit c1192065ea
parent 1b06fe1ef5
1 changed files with 0 additions and 4 deletions
--- 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"