fix merge

Author: t-webber

clippy_lints/src/manual_unwrap_or_default.rs

@@ -131,23 +131,13 @@ fn handle<'tcx>(cx: &LateContext<'tcx>, if_let_or_match: IfLetOrMatch<'tcx>, exp
         },
     };
 
-<<<<<<< HEAD
-    // // We check if the expression is not a None variant
-    if let Some(none_def_id) = cx.tcx.lang_items().option_none_variant() {
-        if let ExprKind::Path(QPath::Resolved(_, path)) = &condition.kind {
-            if let Some(def_id) = path.res.opt_def_id() {
-                if cx.tcx.parent(def_id) == none_def_id {
-                    return;
-                }
-=======
     // We check if the condition is not a None variant
-   let none_def_id = cx.tcx.lang_items().option_none_variant().unwrap();
-    if let ExprKind::Path(QPath::Resolved(_, path)) =  &condition.kind {
+    let none_def_id = cx.tcx.lang_items().option_none_variant().unwrap();
+    if let ExprKind::Path(QPath::Resolved(_, path)) = &condition.kind {
         if let Some(def_id) = path.res.opt_def_id() {
-        if cx.tcx.parent(def_id) == none_def_id {
+            if cx.tcx.parent(def_id) == none_def_id {
                 dbg!("found none");
-                 return;
->>>>>>> refs/remotes/origin/master
+                return;
             }
         }
     }