Revert "Refactoring: remove when used for only one expression"

This reverts commit 0565c7d.
IntersectMBO · Jun 24, 2022 · ba1a8c3 · ba1a8c3
1 parent 626ca82
commit ba1a8c3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/nix/workbench/default.nix b/nix/workbench/default.nix
@@ -79,10 +79,6 @@ let
 
       # If set libraries and executables are not stripped. By default, they are.
       dontStrip = true;
-<<<<<<< HEAD
-
-=======
->>>>>>> parent of 0565c7dfc... Refactoring: remove  when used for only one expression
     };
 
   workbench = with cardanoNodePackages; with pkgs; workbench' (