Skip to content

Commit 18bdbe2

Browse files
committed
master pull
1 parent 5756757 commit 18bdbe2

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

lib/getwidget.dart

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,8 @@ export 'package:getwidget/components/tabs/gf_tabs.dart';
4545
export 'package:getwidget/components/toast/gf_toast.dart';
4646
export 'package:getwidget/components/toggle/gf_toggle.dart';
4747
export 'package:getwidget/components/typography/gf_typography.dart';
48-
<<<<<<< HEAD
49-
export 'package:getwidget/components/rating/gf_rating.dart';
50-
export 'package:getwidget/components/slidable/gf_slidable.dart';
51-
export 'package:getwidget/components/shimmer/gf_shimmer.dart';
52-
export 'package:getwidget/components/loader/gf_loader.dart';
53-
export 'package:getwidget/components/progress_bar/gf_progress_bar.dart';
54-
export 'package:getwidget/components/checkbox/gf_checkbox.dart';
55-
export 'package:getwidget/components/border/gf_border.dart';
56-
export 'package:getwidget/components/checkbox_list_tile/gf_checkbox_list_tile.dart';
57-
export 'package:getwidget/components/radio/gf_radio.dart';
58-
export 'package:getwidget/components/radio_list_tile/gf_radio_list_tile.dart';
59-
export 'package:getwidget/components/text_field/gf_text_field.dart';
6048
export 'package:getwidget/components/dropdown/gf_dropdown.dart';
61-
=======
62-
>>>>>>> f7045501c4ab0ed96a4b4853cc9a489ea1391239
49+
export 'package:getwidget/components/dropdown/multilevel.dart';
6350

6451
export 'colors/gf_color.dart';
6552
export 'direction/gf_shimmer_direction.dart';

0 commit comments

Comments
 (0)