- Resolve merge conflict
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0343012a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0343012a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0343012a Branch: refs/heads/develop Commit: 0343012a5fb1363da518516a8761dcf2619088ab Parents: b073014 328a265 Author: piotrz <pio...@apache.org> Authored: Sat Dec 17 11:08:11 2016 +0100 Committer: piotrz <pio...@apache.org> Committed: Sat Dec 17 11:08:11 2016 +0100 ---------------------------------------------------------------------- .../flexjs/MDLExample/src/main/flex/Cards.mxml | 4 +--- .../flex/org/apache/flex/svg/CompoundGraphic.as | 20 ++++++++++---------- .../main/flex/org/apache/flex/svg/DOMWrapper.as | 4 ++-- .../flex/org/apache/flex/svg/GraphicShape.as | 16 ++++++++-------- .../org/apache/flex/core/SimpleCSSValuesImpl.as | 2 +- .../flex/org/apache/flex/utils/LayoutTweener.as | 1 + .../flex/org/apache/flex/svg/CompoundGraphic.as | 20 ++++++++++---------- .../main/flex/org/apache/flex/svg/DOMWrapper.as | 4 ++-- .../flex/org/apache/flex/svg/GraphicShape.as | 16 ++++++++-------- 9 files changed, 43 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
