diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
| commit | c6fd65ef7639cd67487c831db10dd79e4510efa6 (patch) | |
| tree | 2c825413c26df7d0c5394d01c2599003cab87c0b /app/i18n/en/feedback.php | |
| parent | 93f7f849874dcdf1263370ff08c72a962f8de56f (diff) | |
| parent | 17c3e616e8c3b927ee46258a8b8b20371bf59592 (diff) | |
Resolve git conflict
Diffstat (limited to 'app/i18n/en/feedback.php')
| -rw-r--r-- | app/i18n/en/feedback.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php index c9189c0d0..7ce2ae9cf 100644 --- a/app/i18n/en/feedback.php +++ b/app/i18n/en/feedback.php @@ -21,7 +21,6 @@ return array( 'success' => 'You are disconnected', ), 'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.', - 'not_persona' => 'Only Persona system can be reset.', ), 'conf' => array( 'error' => 'An error occurred during configuration saving', |