wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Resolve conflict

Browse source
This commit is contained in:
Eelco Dolstra 2024-09-26 00:17:03 +02:00
parent e87be60055
commit ba81598017
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/nixos/default.nix
View file

@ -146,15 +146,6 @@ in
functional_root = runNixOSTestFor "x86_64-linux" ./functional/as-root.nix;
user-sandboxing = runNixOSTestFor "x86_64-linux" ./user-sandboxing;
<<<<<<< HEAD
=======
s3-binary-cache-store = runNixOSTestFor "x86_64-linux" ./s3-binary-cache-store.nix;
fsync = runNixOSTestFor "x86_64-linux" ./fsync.nix;
cgroups = runNixOSTestFor "x86_64-linux" ./cgroups;
fetchurl = runNixOSTestFor "x86_64-linux" ./fetchurl.nix;
>>>>>>> f2f47fa72 (Add a test for builtin:fetchurl cert verification)
}