complete_import: prevent panic when the anchor is the completion source range

(fix rebase mess)

 Please enter the commit message for your changes. Lines starting

2 files changed, 1 insertions, 9 deletions

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 0f866e6c2..ce80be17f 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -14,12 +14,8 @@ use crate::{
     generics::GenericParams,
     expr::{scope::{ExprScopes, ScopeId}, PatId},
     impl_block::ImplBlock,
-<<<<<<< HEAD
     path::Path,
     Trait
-=======
-    path::Path, Trait,
->>>>>>> complete_import: add new import resolver infrastructure with some hardcoded importable name.
 };
 
 #[derive(Debug, Clone, Default)]
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index a6f0ab289..42399622a 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -19,11 +19,7 @@ use ra_syntax::{
 
 use crate::{
     HirDatabase, Function, Struct, Enum, Const, Static, Either, DefWithBody, PerNs, Name,
-<<<<<<< HEAD
-    AsName, Module, HirFileId, Crate, Trait, Resolver, Ty,
-=======
-    AsName, Module, HirFileId, Crate, Trait, Resolver, ImportResolver,
->>>>>>> complete_import: add new import resolver infrastructure with some hardcoded importable name.
+    AsName, Module, HirFileId, Crate, Trait, Resolver, Ty, ImportResolver,
     expr::{BodySourceMap, scope::{ScopeId, ExprScopes}},
     ids::LocationCtx,
     expr, AstId,