diff options
| author | James Booth <boothj5@gmail.com> | 2014-09-07 22:36:05 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-09-07 22:36:05 +0100 |
| commit | aeca03d34860afcb203bc6e4bc599961b14283a9 (patch) | |
| tree | ce58e5b2326ed196012022b5dc33d7b6e67b1e51 /src/server_events.c | |
| parent | 14ede0e44c412c7b586feb932c0b9ca2ee1b048f (diff) | |
| parent | b69c9aad8722c0fe1e115b15300743a36fc09305 (diff) | |
| download | profani-tty-aeca03d34860afcb203bc6e4bc599961b14283a9.tar.gz | |
Merge branch 'master' into roomconfig
Diffstat (limited to 'src/server_events.c')
| -rw-r--r-- | src/server_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server_events.c b/src/server_events.c index f2c4587a..6bc06248 100644 --- a/src/server_events.c +++ b/src/server_events.c @@ -608,6 +608,6 @@ handle_ping_error_result(const char * const from, const char * const error) if (error == NULL) { cons_show_error("Error returned from pinging %s.", from); } else { - cons_show_error("Error returned form pinging %s: %s.", from, error); + cons_show_error("Error returned from pinging %s: %s.", from, error); } } |