🐛 remove the merge marker and add link to license

README.md

@@ -8,7 +8,7 @@
 [![nushell version][nushell-badge]][nushell-url]
 
 [mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg?color=brightgreen
-[mit-url]: LICENSE
+[mit-url]: https://github.com/nushell/nufmt/blob/main/LICENSE
 [discord-badge]: https://img.shields.io/discord/678763474494423051?logo=discord&label=discord&color=brightgreen
 [discord-url]: https://discord.gg/NtAbbGn
 [ci-badge]: https://github.com/nushell/nufmt/actions/workflows/main.yml/badge.svg

src/formatting.rs

@@ -62,15 +62,13 @@ pub(crate) fn format_inner(contents: &[u8], _config: &Config) -> Vec<u8> {
  out = write_only_if_have_comments(skipped_contents, out, true);
  }
 
- let mut bytes = working_set.get_span_contents(span);
- let content = String::from_utf8_lossy(bytes).to_string();
  let mut bytes = working_set.get_span_contents(span);
  let content = String::from_utf8_lossy(bytes).to_string();
  trace!("shape is {shape}");
  trace!("shape contents: {:?}", &content);
 
  match shape {
- FlatShape::String | FlatShape::Int | FlatShape::Nothing => out.extend(bytes),
+ FlatShape::Int | FlatShape::Nothing => out.extend(bytes),
  FlatShape::StringInterpolation => {
  out.extend(bytes);
  inside_string_interpolation = !inside_string_interpolation;
@@ -130,11 +128,7 @@ pub(crate) fn format_inner(contents: &[u8], _config: &Config) -> Vec<u8> {
  let printable = String::from_utf8_lossy(remaining_contents).to_string();
  trace!("contents: {:?}", printable);
 
-<<<<<<< HEAD
- out = write_only_if_have_comments(remaining_contents, out);
-=======
  out = write_only_if_have_comments(remaining_contents, out, false);
->>>>>>> 8d0769e (:construction: advance on write comments function)
  }
 
  start = span.end + 1;