From d066470c915bc6abbf5031f4a01fe20b6f1207b8 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Fri, 15 Mar 2024 00:07:33 -0400
Subject: [PATCH] Revert "Update default.nix"

This reverts commit 058fd305af70620f39899d27819e273a85f88f41.
---
 hosts/mauville/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index 35c21fc9..94b2a9a0 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -34,11 +34,8 @@
   hardware.opengl.extraPackages32 = with pkgs; [
     driversi686Linux.amdvlk
   ];
-<<<<<<< HEAD
 
   environment.systemPackages = [ pkgs.backblaze-b2 ];
-=======
->>>>>>> parent of 7951bcd (mauville: added backblaze-b2 cli utilit)
   
   # Removed because it defaults the session to X11 instead of Wayland
   # services.xserver.displayManager.autoLogin.enable = true;