From 248cf31960975d6acb996b29d9a7c142b13cac02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 26 Sep 2024 00:17:03 +0200
Subject: [PATCH] Resolve conflict

---
 tests/nixos/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index 10b8ffc1e..c5b0f68f1 100644
--- 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)
 }