Resolve conflict

NixOS · Jan 1, 2025 · de4c784 · de4c784
1 parent 63749b3
commit de4c784
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/functional/import-from-derivation.nix b/tests/functional/import-from-derivation.nix
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/config.nix";
-=======
-with import <config>;
->>>>>>> 08361f031 (EvalState::realiseContext(): Allow access to the entire closure)
 
 rec {
   bar = mkDerivation {