Skip to content

F
Front-End
Unverified Commit 273364e2 authored by Ian Hickson's avatar Ian Hickson Committed by GitHub
Browse files
Options

Fix merge conflict. (#25718)

parent c0b20a76
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
packages/flutter/lib/src/material/input_decorator.dart
View file @ 273364e2
...@@ -2691,7 +2691,7 @@ class InputDecoration { ...@@ -2691,7 +2691,7 @@ class InputDecoration {
@override @override
int get hashCode { int get hashCode {
// Split into two hashValues calls because the hashValues function is // Split into several hashValues calls because the hashValues function is
// limited to 20 parameters. // limited to 20 parameters.
return hashValues( return hashValues(
icon, icon,
...@@ -2713,8 +2713,8 @@ class InputDecoration { ...@@ -2713,8 +2713,8 @@ class InputDecoration {
fillColor, fillColor,
border, border,
enabled, enabled,
prefixIcon,
hashValues( hashValues(
prefixIcon,
prefix, prefix,
prefixText, prefixText,
prefixStyle, prefixStyle,
...@@ -2733,8 +2733,10 @@ class InputDecoration { ...@@ -2733,8 +2733,10 @@ class InputDecoration {
enabledBorder, enabledBorder,
border, border,
enabled, enabled,
semanticCounterText, hashValues(
alignLabelWithHint, semanticCounterText,
alignLabelWithHint,
),
), ),
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab