fix: formatting and merge conflicts

2025-09-03 10:23:04 +02:00
parent d40cba92ff
commit c137417db2
2 changed files with 6 additions and 11 deletions
--- a/modules/develPackages.nix
+++ b/modules/develPackages.nix
@@ -4,10 +4,6 @@
  lib,
  ...
 }:
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 {
  environment.systemPackages = with pkgs; [
    gdb
@@ -62,8 +58,5 @@

  ];

-<<<<<<< Updated upstream
-=======
  programs.dconf.enable = lib.mkDefault true;
->>>>>>> Stashed changes
 }