From 9e4f938d03c72bdcd81b020ab5276b969023a7e3 Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@gmail.com>
Date: Sat, 1 Feb 2025 18:44:15 -0800
Subject: new flake lock

---
 nix/modules/xserver.nix | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'nix/modules/xserver.nix')

diff --git a/nix/modules/xserver.nix b/nix/modules/xserver.nix
index c47cf65..0298f12 100644
--- a/nix/modules/xserver.nix
+++ b/nix/modules/xserver.nix
@@ -7,18 +7,10 @@
     };
 
     windowManager = {
-<<<<<<< Updated upstream
-      # Backup in case wayland isn't sufficient
-      i3 = {
-	enable = true;
-	package = pkgs.i3-gaps;
-      };
-=======
 	i3 = {
 	  enable = true;
 	  package = pkgs.i3-gaps;
 	};
->>>>>>> Stashed changes
     };
 
     desktopManager = {
-- 
cgit