Resolve conflict

NixOS · Sep 25, 2024 · 6efc727 · 6efc727
1 parent 2e82f9e
commit 6efc727
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
@@ -164,15 +164,6 @@ in
   gzip-content-encoding = runNixOSTestFor "x86_64-linux" ./gzip-content-encoding.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)
 }