aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-07-09 15:19:04 +0200
committerFredrik Gustafsson <[email protected]>2013-07-09 15:19:04 +0200
commit393a6c033b7291679eab525cd599024de8b28eec (patch)
tree4fe5c153e2c0e810aee9e729054a81a9c265c3fa
parent6ffa9ea73806a5c025d3c589cebdd911930060de (diff)
parent903f7be44820731dd0f9989024c72ead07e90e81 (diff)
downloadotp-393a6c033b7291679eab525cd599024de8b28eec.tar.gz
otp-393a6c033b7291679eab525cd599024de8b28eec.tar.bz2
otp-393a6c033b7291679eab525cd599024de8b28eec.zip
Merge branch 'maint'
-rw-r--r--lib/stdlib/src/gen_server.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 4a16ed120f..a85673aa1a 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -124,7 +124,7 @@
{noreply, NewState :: term()} |
{noreply, NewState :: term(), timeout() | hibernate} |
{stop, Reason :: term(), NewState :: term()}.
--callback handle_info(Info :: timeout() | term(), State :: term()) ->
+-callback handle_info(Info :: timeout | term(), State :: term()) ->
{noreply, NewState :: term()} |
{noreply, NewState :: term(), timeout() | hibernate} |
{stop, Reason :: term(), NewState :: term()}.