From 25fb08791a9fc1bc16bb69acd865f44d917e7e99 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 22 Jan 2023 21:58:22 +0100
Subject: [PATCH] Correct merge conflict

---
 lib/mrsk/configuration.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/mrsk/configuration.rb b/lib/mrsk/configuration.rb
index 498700a8..b44d6988 100644
--- 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