fixed synce errors

2026-03-27 15:13:15 -05:00
parent 648335ec72
commit ee48345a74
3 changed files with 48 additions and 171 deletions
--- a/modules/bip110.nix
+++ b/modules/bip110.nix
@@ -4,20 +4,12 @@ let
  cfg = config.sovran_systemsOS;
 in
 {
-<<<<<<< HEAD
-=======
-  # ✅ Option definition
->>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
  options.sovran_systemsOS.packages.bip110 = lib.mkOption {
    type = lib.types.nullOr lib.types.package;
    default = null;
    description = "BIP110 Bitcoin package";
  };

-<<<<<<< HEAD
-=======
-  # ✅ Implementation
->>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
  config = lib.mkIf (
    cfg.features.bip110 &&
    cfg.packages.bip110 != null