Correct merge conflict

2023-01-22 21:58:22 +01:00
parent 6231a8668c
commit 25fb08791a
1 changed files with 0 additions and 1 deletions
--- a/lib/mrsk/configuration.rb
+++ b/lib/mrsk/configuration.rb
@@ -131,7 +131,6 @@ class Mrsk::Configuration
      volume_args: volume_args,
      ssh_options: ssh_options,
      builder: raw_config.builder
-      builder: config.builder
    }.compact
  end