Fixing merge issues.

flare_dart/lib/actor_drawable.dart

@@ -6,15 +6,12 @@ import "actor_node.dart";
 import "math/aabb.dart";
 
 enum BlendModes { normal, multiply, screen, additive }
-<<<<<<< HEAD
-=======
 
 class ClipShape {
   final ActorShape shape;
   final bool intersect;
   ClipShape(this.shape, this.intersect);
 }
->>>>>>> master
 
 abstract class ActorDrawable extends ActorNode {
   List<List<ClipShape>> _clipShapes;
@@ -70,17 +67,10 @@ abstract class ActorDrawable extends ActorNode {
 
   @override
   void completeResolve() {
-<<<<<<< HEAD
-    _clipShapes = <List<ActorShape>>[];
-    List<List<ActorClip>> clippers = allClips;
-    for (final List<ActorClip> clips in clippers) {
-      List<ActorShape> shapes = <ActorShape>[];
-=======
     _clipShapes = <List<ClipShape>>[];
     List<List<ActorClip>> clippers = allClips;
     for (final List<ActorClip> clips in clippers) {
       List<ClipShape> shapes = <ClipShape>[];
->>>>>>> master
       for (final ActorClip clip in clips) {
         clip.node.all((ActorNode node) {
           if (node is ActorShape) {

flare_dart/lib/actor_node.dart

@@ -14,12 +14,9 @@ class ActorClip {
   ActorNode node;
 
   ActorClip(this.clipIdx);
-<<<<<<< HEAD
-=======
   ActorClip.copy(ActorClip from)
       : clipIdx = from.clipIdx,
         intersect = from.intersect;
->>>>>>> master
 }
 
 class ActorNode extends ActorComponent {

flare_dart/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flare_dart
 description: Vector design and runtime animation.
-version: 2.1.0
+version: 2.2.0
 author: "2Dimensions Team <[email protected]>"
 homepage: https://github.com/2d-inc/Flare-Flutter
 environment:

flare_flutter/lib/flare.dart

@@ -205,15 +205,12 @@ class FlutterActorShape extends ActorShape with FlutterActorDrawable {
     _isValid = true;
     _path.reset();
 
-<<<<<<< HEAD
-=======
     if (fill != null && fill.fillRule == FillRule.evenOdd) {
       _path.fillType = PathFillType.evenOdd;
     } else {
       _path.fillType = PathFillType.nonZero;
     }
 
->>>>>>> master
     for (final ActorBasePath path in paths) {
       Mat2D transform = path.pathTransform;
       _path.addPath((path as FlutterPath).path, ui.Offset.zero,