From a924db7d0b0e23ea39c59c76933111c44703dbfc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 16 Dec 2024 18:01:52 +0100
Subject: [PATCH] Resolve merge conflict

---
 src/libexpr/eval.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 823fb4ce7fb..4de4646783c 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -3123,14 +3123,7 @@ std::optional<std::string> EvalState::resolveLookupPathPath(const LookupPath::Pa
             allowPath(path);
             if (store->isInStore(path)) {
                 try {
-<<<<<<< HEAD
-                    StorePathSet closure;
-                    store->computeFSClosure(store->toStorePath(path).first, closure);
-                    for (auto & p : closure)
-                        allowPath(p);
-=======
-                    allowClosure(store->toStorePath(path.path.abs()).first);
->>>>>>> 08361f031 (EvalState::realiseContext(): Allow access to the entire closure)
+                    allowClosure(store->toStorePath(path).first);
                 } catch (InvalidPath &) { }
             }
         }