Fix rebase issues

forus-labs · Jun 14, 2024 · 9f02088 · 9f02088
1 parent 9454f1c
commit 9f02088
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/forui/test/src/widgets/dialog/dialog_golden_test.dart b/forui/test/src/widgets/dialog/dialog_golden_test.dart
@@ -1,14 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-<<<<<<< HEAD:forui/test/src/widgets/dialog_golden_test.dart
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:forui/forui.dart';
-import '../test_scaffold.dart';
-=======
 import '../../test_scaffold.dart';
->>>>>>> 3323baa (increase tolerance of dialog golden tests):forui/test/src/widgets/dialog/dialog_golden_test.dart
 
 class UnderTest extends StatelessWidget {
   final FDialogAlignment alignment;