Remove accidentally left-behind git mark

CraftSpider · CraftSpider · commit ac75fafd1c25 · 2021-02-06T17:37:36.000-05:00
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
@@ -434,7 +434,6 @@ impl From<clean::Impl> for Impl {
     }
 }
 
-<<<<<<< HEAD
 crate fn from_function_method(function: clean::Function, has_body: bool) -> Method {
     let clean::Function { header, decl, generics, all_types: _, ret_types: _ } = function;
     Method {

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,6 @@ impl From<clean::Impl> for Impl {`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`
`437`		`-<<<<<<< HEAD`
`438`	`437`	`crate fn from_function_method(function: clean::Function, has_body: bool) -> Method {`
`439`	`438`	`let clean::Function { header, decl, generics, all_types: _, ret_types: _ } = function;`
`440`	`439`	`Method {`