spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct merge conflict

Browse Source
This commit is contained in:
David Heinemeier Hansson
2023-01-22 21:58:22 +01:00
parent 6231a8668c
commit 25fb08791a
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/mrsk/configuration.rb
View File

@@ -131,7 +131,6 @@ class Mrsk::Configuration
volume_args: volume_args, volume_args: volume_args,
ssh_options: ssh_options, ssh_options: ssh_options,
builder: raw_config.builder builder: raw_config.builder
builder: config.builder
}.compact }.compact
end end