rebase: fix things that I messed up during rebase

2024-11-08 01:02:04 +01:00
1 changed files with 0 additions and 8 deletions
--- a/modules/nixos/desktop/addons/hyprpaper/default.nix
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@ -1,15 +1,7 @@
 {
  config,
-<<<<<<< HEAD
  lib,
  namespace,
-=======
-  inputs,
-  lib,
-  namespace,
-  pkgs,
-  system,
->>>>>>> 8f3c53de (hyprland: setup hyprpanel, fix nvidia issues, accomodate new shadow config)
  ...
 }:
 let