Fixed merge conflicts

CyBear-Jinni · Dec 29, 2023 · 1001538 · 1001538
1 parent e0a77e0
commit 1001538
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -21,4 +21,5 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 </manifest>
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -21,4 +21,5 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 </manifest>
diff --git 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
@@ -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 {