From 85555fda88d6e247fa347ef8000b8d55bbcc3550 Mon Sep 17 00:00:00 2001 From: Jost Schulte Date: Fri, 11 Oct 2024 11:26:54 -0600 Subject: [PATCH] fix: resolve merge conflict --- src/pages/get-started/install-advanced.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/pages/get-started/install-advanced.md b/src/pages/get-started/install-advanced.md index d0bffcec2..5740e799d 100644 --- a/src/pages/get-started/install-advanced.md +++ b/src/pages/get-started/install-advanced.md @@ -17,13 +17,7 @@ If you want to learn more about how this setup works and how to create it manual ### Holonix's usage of Nix's flake feature -<<<<<<< HEAD -[Flakes](https://wiki.nixos.org/wiki/Flakes) is an experimental but well-supported feature of the Nix package manager that makes it easier to manage dependencies consistently. - -As of [holochain#1863](https://github.com/holochain/holochain/pull/1863) Holonix is implemented as Holochain's [flake.nix](https://github.com/holochain/holochain/blob/main/flake.nix) output named _#holonix_ a.k.a. _devShells.${system}.holonix_. -======= [Flakes](https://wiki.nixos.org/wiki/Flakes) is an experimental but well-supported feature of the Nix package manager that makes it easier to manage dependencies consistently. [Enable flakes on your system.](https://wiki.nixos.org/wiki/Flakes#Enable_flakes_temporarily) ->>>>>>> 248f5967373e66a02b71482f9e88bb033a75e1d5 The flake-based one-liner to get you an ad-hoc Holonix shell looks like this: