From 0f19bfe81188974bc6bc15b320a8b82b1c90ab06 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 28 Jan 2025 09:20:56 +0100
Subject: [PATCH] Fix conflict

---
 src/libexpr/primops.cc | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index a0ff660a8..75597e6cb 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -40,15 +40,6 @@ namespace nix {
  * Miscellaneous
  *************************************************************/
 
-<<<<<<< HEAD
-=======
-static inline Value * mkString(EvalState & state, const std::csub_match & match)
-{
-    Value * v = state.allocValue();
-    v->mkString({match.first, match.second});
-    return v;
-}
-
 std::string EvalState::realiseString(Value & s, StorePathSet * storePathsOutMaybe, bool isIFD, const PosIdx pos)
 {
     nix::NixStringContext stringContext;
@@ -58,7 +49,6 @@ std::string EvalState::realiseString(Value & s, StorePathSet * storePathsOutMayb
     return nix::rewriteStrings(rawStr, rewrites);
 }
 
->>>>>>> 7465fbe92 (refactor: Extract EvalState::realiseString)
 StringMap EvalState::realiseContext(const NixStringContext & context, StorePathSet * maybePathsOut, bool isIFD)
 {
     std::vector<DerivedPath::Built> drvs;