From 1001538bd293656e45e94a2bf7c0755255f73aef Mon Sep 17 00:00:00 2001 From: Guy Luz Date: Fri, 29 Dec 2023 18:37:16 +0200 Subject: [PATCH] Fixed merge conflicts --- android/app/src/debug/AndroidManifest.xml | 1 + android/app/src/profile/AndroidManifest.xml | 1 + lib/presentation/atoms/atoms.dart | 2 +- lib/presentation/atoms/button_atom.dart | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index f719cd50..0152a860 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -21,4 +21,5 @@ + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index f719cd50..0152a860 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -21,4 +21,5 @@ + diff --git a/lib/presentation/atoms/atoms.dart b/lib/presentation/atoms/atoms.dart index 6eeb6a3c..16fffc91 100644 --- a/lib/presentation/atoms/atoms.dart +++ b/lib/presentation/atoms/atoms.dart @@ -1,6 +1,6 @@ export 'bottom_navigation_bar_item_atom.dart'; -export 'card_atom.dart'; export 'button_atom.dart'; +export 'card_atom.dart'; export 'circular_progress_indicator_atom.dart'; export 'icon_atom.dart'; export 'image_atom.dart'; diff --git a/lib/presentation/atoms/button_atom.dart b/lib/presentation/atoms/button_atom.dart index 3df34941..5540d2f9 100644 --- a/lib/presentation/atoms/button_atom.dart +++ b/lib/presentation/atoms/button_atom.dart @@ -1,4 +1,4 @@ -import 'package:cybear_jinni/presentation/atoms/atoms.dart'; +import 'package:cybearjinni/presentation/atoms/atoms.dart'; import 'package:flutter/material.dart'; class ButtonWidgetAtom extends StatelessWidget {