From 18aee952be3aa7202145d56b76dd0ea60f53b3a0 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 29 Dec 2024 13:06:54 -0700
Subject: [PATCH] [NixOS] Fix biskcomp

---
 nixos/machines/biskcomp.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix
index 6fe88b0d..c13676c8 100644
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -76,7 +76,6 @@ in
     file = ../secrets/discourse-secret-key-base.age;
     group = "users";
     owner = "discourse";
->>>>>>> 03012f56 ([NixOS] Fail to fix discourse-admin-password)
   };
 
   services.discourse = {