From 4d4e304446e45e0353ffc712ccaabcc4a426b1ff Mon Sep 17 00:00:00 2001
From: Daniel <89086143+BardofSprites@users.noreply.github.com>
Date: Thu, 18 Jan 2024 05:07:48 -0500
Subject: fix merge conflict

---
 bard-emacs-modules/bard-emacs-emms.el | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bard-emacs-modules/bard-emacs-emms.el')

diff --git a/bard-emacs-modules/bard-emacs-emms.el b/bard-emacs-modules/bard-emacs-emms.el
index cb668ad..1b163a5 100644
--- a/bard-emacs-modules/bard-emacs-emms.el
+++ b/bard-emacs-modules/bard-emacs-emms.el
@@ -3,6 +3,7 @@
 ;; |------------------------------------|
 
 (require 'emms)
+(require 'emms-setup)
 (require 'emms-mpris)
 
 (emms-all)
-- 
cgit v1.2.3