Fix bad merge conflict

56de42b7 · Clement Ho · 51d455d0 · 56de42b7
Commit 56de42b7 authored May 23, 2018 by Clement Ho
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/stylesheets/framework/forms.scss app/assets/stylesheets/framework/forms.scss +1 -1

No files found.
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -125,7 +125,7 @@ label {
  &.input-short {
    width: $input-short-width;

-    @media (min-width: $screen-md-min) {
+    @include media-breakpoint-up(md) {
      width: $input-short-md-width;
    }
  }