From b7c11699f06e321ee489b60f8cb7a5d78b710b32 Mon Sep 17 00:00:00 2001
From: Komodo <45665554+Komodo5197@users.noreply.github.com>
Date: Sun, 19 May 2024 00:50:31 -0400
Subject: [PATCH] Merge fix.

---
 lib/models/finamp_models.dart   | 2 +-
 lib/services/queue_service.dart | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/models/finamp_models.dart b/lib/models/finamp_models.dart
index debb8d3d8..d2fccfa50 100644
--- a/lib/models/finamp_models.dart
+++ b/lib/models/finamp_models.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:Finamp/components/global_snackbar.dart';
 import 'package:audio_service/audio_service.dart';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:collection/collection.dart';
+import 'package:finamp/components/global_snackbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
diff --git a/lib/services/queue_service.dart b/lib/services/queue_service.dart
index ee5338d07..2b6438257 100644
--- a/lib/services/queue_service.dart
+++ b/lib/services/queue_service.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:math';
 
+import 'package:audio_service/audio_service.dart';
+import 'package:collection/collection.dart';
 import 'package:finamp/components/global_snackbar.dart';
 import 'package:finamp/models/finamp_models.dart';
 import 'package:finamp/models/jellyfin_models.dart' as jellyfin_models;
-import 'package:audio_service/audio_service.dart';
-import 'package:collection/collection.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive_flutter/hive_flutter.dart';