diff options
| author | Rune Tynan <runetynan@gmail.com> | 2021-02-06 17:37:36 -0500 |
|---|---|---|
| committer | Rune Tynan <runetynan@gmail.com> | 2021-02-06 17:37:36 -0500 |
| commit | ac75fafd1c254dd96a22a289fcad18287875f061 (patch) | |
| tree | 03ab3ebaf025c155c8509cc8adcff8c61d37427e /src | |
| parent | 30ecde0bebbf235867eb8652e5745c7efd771340 (diff) | |
Remove accidentally left-behind git mark
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/json/conversions.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs index d9f52cbf34c..a4592ddc943 100644 --- 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 { |