Skip to content

Commit 3c72edf

Browse files
committed
PAINTROID-796: fix conflict
1 parent 247b013 commit 3c72edf

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

analysis_options.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ analyzer:
2020

2121
exclude:
2222
- lib/src/**.pb*.dart
23-
- lib/**.g.dart
23+
- lib/**.g.dart
24+
- test/**.mocks.dart

lib/core/commands/command_implementation/command.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'dart:ui';
21
import 'package:equatable/equatable.dart';
32
import 'package:paintroid/core/commands/command_implementation/graphic/clipboard_command.dart';
43
import 'package:paintroid/core/commands/command_implementation/graphic/delete_region_command.dart';

test/unit/serialization/utils/dummy_version_strategy.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class DummyVersionStrategy implements IVersionStrategy {
1313
final int clipboardCommandVersion;
1414
final int deleteRegionCommandVersion;
1515
final int textCommandVersion;
16+
final int dashedPathCommandVersion;
1617
final int clipPathCommandVersion;
1718
final int clipAreaCommandVersion;
1819

@@ -32,6 +33,8 @@ class DummyVersionStrategy implements IVersionStrategy {
3233
this.deleteRegionCommandVersion =
3334
SerializerVersion.DELETE_REGION_COMMAND_VERSION,
3435
this.textCommandVersion = SerializerVersion.TEXT_COMMAND_VERSION,
36+
this.dashedPathCommandVersion =
37+
SerializerVersion.DASHED_PATH_COMMAND_VERSION,
3538
this.clipPathCommandVersion = SerializerVersion.CLIP_PATH_COMMAND_VERSION,
3639
this.clipAreaCommandVersion = SerializerVersion.CLIP_AREA_COMMAND_VERSION,
3740
});
@@ -69,6 +72,9 @@ class DummyVersionStrategy implements IVersionStrategy {
6972
@override
7073
int getTextCommandVersion() => textCommandVersion;
7174

75+
@override
76+
int getDashedPathCommandVersion() => dashedPathCommandVersion;
77+
7278
@override
7379
int getClipPathCommandVersion() => clipPathCommandVersion;
7480

0 commit comments

Comments
 (0)