format patches (again)

patches/glitch/system-font.patch

@@ -24,6 +24,19 @@ index a00b2936f..340294d73 100644
    &.app-body {
      padding: 0;
  
+diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
+index 8ba8bec10..e5db3303f 100644
+--- a/app/javascript/flavours/glitch/styles/components/modal.scss
++++ b/app/javascript/flavours/glitch/styles/components/modal.scss
+@@ -1131,7 +1131,7 @@
+       width: 100%;
+       border: 0;
+       padding: 10px;
+-      font-family: 'mastodon-font-monospace', monospace;
++      font-family: $font-monospace, monospace;
+       background: $ui-base-color;
+       color: $primary-text-color;
+       font-size: 14px;
 diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
 index fbb02c788..3946684ed 100644
 --- a/app/javascript/flavours/glitch/styles/index.scss

patches/system-font.patch

@@ -45,25 +45,15 @@ index 413a1cdd6..fccbf2763 100644
 -
    &.app-body {
      padding: 0;
-<<<<<<< Updated upstream
  
-=======
-
->>>>>>> Stashed changes
 diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
 index 2f6c41d5f..b968ea42d 100644
 --- a/app/javascript/styles/mastodon/variables.scss
 +++ b/app/javascript/styles/mastodon/variables.scss
 @@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%;
-<<<<<<< Updated upstream
  
  $no-gap-breakpoint: 1175px;
  
-=======
-
- $no-gap-breakpoint: 1175px;
-
->>>>>>> Stashed changes
 -$font-sans-serif: 'mastodon-font-sans-serif' !default;
 -$font-display: 'mastodon-font-display' !default;
 -$font-monospace: 'mastodon-font-monospace' !default;