From 85cce1a14fce793682eb56ef9a58592ad44c161c Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sun, 10 Nov 2019 21:58:21 +0100 Subject: [PATCH] Fix missed conflict. Thanks @eugeneius --- guides/source/configuring.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/guides/source/configuring.md b/guides/source/configuring.md index ce2f16105d..d04da4452e 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -879,13 +879,9 @@ text/javascript image/svg+xml application/postscript application/x-shockwave-fla * `config.active_storage.replace_on_assign_to_many` determines whether assigning to a collection of attachments declared with `has_many_attached` replaces any existing attachments or appends to them. The default is `true`. -<<<<<<< HEAD -### Results of `load_defaults` -======= * `config.active_storage.draw_routes` can be used to toggle Active Storage route generation. The default is `true`. ### Results of `config.load_defaults` ->>>>>>> b2864a2069... Merge pull request #37595 `config.load_defaults` sets new defaults up to and including the version passed. Such that passing, say, '6.0' also gets the new defaults from every version before it. -- GitLab