Resolve merge conflict

NixOS · Dec 16, 2024 · a924db7 · a924db7
1 parent f986f7e
commit a924db7
Showing 1 changed file with 1 addition and 8 deletions.
diff --git 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 &) { }
             }
         }