From 15ab87c862e119f652b99eb112d72efed6267591 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Fri, 13 Jun 2025 06:20:22 -0600
Subject: nixos 25.05 update

---
 machines/picast/default.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'machines/picast/default.nix')

diff --git a/machines/picast/default.nix b/machines/picast/default.nix
index ff10ad5..4d24de8 100644
--- a/machines/picast/default.nix
+++ b/machines/picast/default.nix
@@ -28,11 +28,7 @@
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
   # Set your time zone.
-<<<<<<< HEAD
-  time.timeZone = "US/Mountain";
-=======
   time.timeZone = "America/Denver";
->>>>>>> 7d7f5905769c488d2129b2ec0ade6451f0765d84
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
-- 
cgit v1.2.3