diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
| commit | 196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3 (patch) | |
| tree | 51fa0436998541c3bcc1885eaa2188d7dbb7d469 /lib/pleroma/config/transfer_task.ex | |
| parent | c3ecaea64dd377b586e3b2a5316e90884ec78fe6 (diff) | |
| parent | fe548f322e834c7c81678a460c54c71f1198021c (diff) | |
| download | pleroma-196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3.tar.gz | |
Resolve merge conflicts
Diffstat (limited to 'lib/pleroma/config/transfer_task.ex')
| -rw-r--r-- | lib/pleroma/config/transfer_task.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex index 3c13a0558..7799b2a78 100644 --- a/lib/pleroma/config/transfer_task.ex +++ b/lib/pleroma/config/transfer_task.ex @@ -35,7 +35,7 @@ defmodule Pleroma.Config.TransferTask do if String.starts_with?(setting.key, "Pleroma.") do "Elixir." <> setting.key else - setting.key + String.trim_leading(setting.key, ":") end group = String.to_existing_atom(setting.group) |