From 4c784f5f338dd08fc7764d157191712ae0a17212 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Mon, 15 Dec 2025 15:06:54 -0600
Subject: [PATCH] pi stuff

---
 systems/aarch64-linux/pi5/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index 2c70d06..316f9b7 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -93,12 +93,7 @@
   # #                  FileSystems                  # #
   # ###################################################
 
-<<<<<<< HEAD
   boot.supportedFilesystems = [ "bcachefs" ];
-=======
-  boot.supportedFilesystems = lib.mkForce [ "bcachefs" ];
-
->>>>>>> edbb7bb (pi stuff)
   fileSystems."/data" = {
     device = "/dev/disk/by-uuid/a85420cc-a026-4100-80d2-a999081d792a";
     fsType = "bcachefs";