| Index: sky/sdk/lib/framework/rendering/flex.dart
|
| diff --git a/sky/sdk/lib/framework/rendering/flex.dart b/sky/sdk/lib/framework/rendering/flex.dart
|
| index ae695ca6261fb1b91032e805847ecf87fd0c2e3f..683d94786872da404f9be4aeeda6b9016cd31b85 100644
|
| --- a/sky/sdk/lib/framework/rendering/flex.dart
|
| +++ b/sky/sdk/lib/framework/rendering/flex.dart
|
| @@ -8,11 +8,13 @@ import 'object.dart';
|
|
|
| class FlexBoxParentData extends BoxParentData with ContainerParentDataMixin<RenderBox> {
|
| int flex;
|
| +
|
| void merge(FlexBoxParentData other) {
|
| if (other.flex != null)
|
| flex = other.flex;
|
| super.merge(other);
|
| }
|
| +
|
| String toString() => '${super.toString()}; flex=$flex';
|
| }
|
|
|
|
|