From a69d32d194c8ab168b1113bf36a38c81a9718447 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 12 Jan 2025 13:15:03 +0100
Subject: [PATCH] Resolve conflict

Some of the code before https://github.com/NixOS/nix/pull/11351 did not
have the problem. What remains wasn't all that problematic, but is good
to have anyway.
---
 scripts/nix-profile.sh.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
index 82488c172..1b73e1de4 100644
--- a/scripts/nix-profile.sh.in
+++ b/scripts/nix-profile.sh.in
@@ -3,14 +3,9 @@ if [ -n "${HOME-}" ] && [ -n "${USER-}" ]; then
 
     # Set up the per-user profile.
 
-<<<<<<< HEAD
     NIX_LINK="$HOME/.nix-profile"
     if [ -n "${XDG_STATE_HOME-}" ]; then
         NIX_LINK_NEW="$XDG_STATE_HOME/nix/profile"
-=======
-    if [ -n "${NIX_STATE_HOME-}" ]; then
-        NIX_LINK="$NIX_STATE_HOME/profile"
->>>>>>> 97fffd876 (nix-profile.sh.in: fix envvar condition)
     else
         NIX_LINK_NEW="$HOME/.local/state/nix/profile"
     fi