fix merge artefact

onyx-lyon1 · Oct 9, 2023 · 324f372 · 324f372
1 parent 0e7ed0e
commit 324f372
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/onyx/lib/screens/agenda_config/states/agenda_config_cubit.dart b/apps/onyx/lib/screens/agenda_config/states/agenda_config_cubit.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:onyx/core/res.dart';
 import 'package:onyx/core/search/search_service.dart';
 import 'package:onyx/screens/agenda_config/agenda_config_export.dart';
 
@@ -87,7 +88,6 @@ class AgendaConfigCubit extends Cubit<AgendaConfigState> {
         }
         subSearch(dir.children![directory], query, dirs);
       }
-      subSearch(dir.children[directory], query, dirs);
     }
   }
 

diff --git a/apps/onyx/lib/screens/map/widgets/popup_widgets/restaurant_pop_up_widget.dart b/apps/onyx/lib/screens/map/widgets/popup_widgets/restaurant_pop_up_widget.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_map_marker_popup/flutter_map_marker_popup.dart';
 import 'package:onyx/core/extensions/extensions_export.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_map_marker_cluster/flutter_map_marker_cluster.dart';
 import 'package:izlyclient/izlyclient.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:onyx/screens/agenda/agenda_export.dart';