forgot

IntersectMBO · Jun 24, 2022 · 2dd13ca · 2dd13ca
1 parent 60fb4a7
commit 2dd13ca
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/shell.nix b/shell.nix
@@ -103,11 +103,7 @@ let
 
     shellHook = ''
       ${with customConfig.localCluster;
-<<<<<<< HEAD
         (import ./nix/workbench/shell.nix { inherit lib workbenchDevMode profileName useCabalRun profiled; inherit (cluster) profile;}).shellHook}
-=======
-        (import ./nix/workbench/shell.nix { inherit lib workbenchDevMode profileName useCabalRun; }).shellHook}
->>>>>>> parent of abec8f9c8... Refactoring: Inline pkgs (it was used in both forms)
 
       function workbench_atexit() {
           if wb backend is-running