diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-10-09 15:55:56 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-10-09 15:55:56 +0100 |
| commit | b949fc940e3e019cc7016f97a5a677afb2cd5ff6 (patch) | |
| tree | 32727b8bba1136738a0e19be06199395286c52c0 | |
| parent | eff06e88a2bd873d983866733f2663226cea9e83 (diff) | |
Fix rebase gunk left in error.
| -rw-r--r-- | docs/running/admin_manual.md | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/running/admin_manual.md b/docs/running/admin_manual.md index e135e30a8..d166cb859 100644 --- a/docs/running/admin_manual.md +++ b/docs/running/admin_manual.md @@ -346,11 +346,7 @@ The message will now be associated with the correct request and will appear on t ### Banning a user -<<<<<<< HEAD You may wish to completely ban a user from the website (such as a spammer or troll for example). You need to log into the admin interface at `/admin`. On the top row of links, locate and click on ‘Users’. -======= -You may wish to completely ban a user from the website (such as a spammer or troll for example). You need to log into the admin interface at `admin`. On the top row of links, locate and click on ‘Users’. ->>>>>>> 5ad8992... Use 'admin interface' instead of 'admin tool' Find the user you wish to ban on the list and click on their name. Once on the user page, select ‘edit’. |