From a5401669102a4b534ee81780a86f24845fef5bab Mon Sep 17 00:00:00 2001
From: m3tam3re <m@m3tam3re.com>
Date: Fri, 28 Mar 2025 09:46:28 +0100
Subject: [PATCH] merge with m3-ares

---
 overlays/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/overlays/default.nix b/overlays/default.nix
index d78dd8b..86d5316 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -13,6 +13,7 @@
     brave = prev.brave.override {
       commandLineArgs = "--password-store=gnome-libsecret";
     };
+<<<<<<< Updated upstream
     OVMF = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.OVMF;
     auto-cpufreq = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.auto-cpufreq;
     # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {