Fix bad rebase

DeterminateSystems · Sep 13, 2023 · 6c92aec · 6c92aec
1 parent d29b58d
commit 6c92aec
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/action/common/place_nix_configuration.rs b/src/action/common/place_nix_configuration.rs
@@ -52,19 +52,14 @@ impl PlaceNixConfiguration {
         };
 
         // https://github.com/DeterminateSystems/nix-installer/issues/449#issuecomment-1551782281
-<<<<<<< HEAD
         #[cfg(not(target_os = "macos"))]
         settings.insert("auto-optimise-store".to_string(), "true".to_string());
 
         settings.insert(
             "bash-prompt-prefix".to_string(),
             "(nix:$name)\\040".to_string(),
         );
-=======
-        defaults_conf_settings.push(("bash-prompt-prefix", "(nix:$name)\\040".into()));
-        defaults_conf_settings.push(("max-jobs", "auto".into()));
-        defaults_conf_settings.push(("extra-nix-path", "nixpkgs=flake:nixpkgs".into()));
->>>>>>> f938f56 (Set max-jobs in nix.conf)
+        settings.insert("max-jobs".to_string(), "auto".to_string());
         if let Some(ssl_cert_file) = ssl_cert_file {
             let ssl_cert_file_canonical = ssl_cert_file
                 .canonicalize()