diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
| commit | dec23500d8988c22a99f049ef1d1e49328ba075a (patch) | |
| tree | a6e16c5fa60b02058b1ebd985f20ac8f0f4ffa5b /lib/mix/tasks/pleroma/instance.ex | |
| parent | ab3089d6a718d4a70b0d702307d41e64e17bc505 (diff) | |
| parent | dfde2622d0c14195392e306fadc7c729c68da273 (diff) | |
| download | pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'lib/mix/tasks/pleroma/instance.ex')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 1ef40671c..0a2c891c0 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -75,7 +75,7 @@ defmodule Mix.Tasks.Pleroma.Instance do name = Common.get_option( options, - :name, + :instance_name, "What is the name of your instance? (e.g. Pleroma/Soykaf)" ) |