aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorZandra Hird <zandra@erlang.org>2015-03-18 13:11:41 +0100
committerZandra Hird <zandra@erlang.org>2015-03-18 13:11:41 +0100
commitf6e280b426c38f6b6559934753b34b614c399710 (patch)
tree0fe94b41c87fec1f7c3594f8763a519ff8933898 /lib/kernel
parent6d6968683af1b6fbe030dbcdd7d114404f6ae7a4 (diff)
parent6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c (diff)
downloadotp-f6e280b426c38f6b6559934753b34b614c399710.tar.gz
otp-f6e280b426c38f6b6559934753b34b614c399710.tar.bz2
otp-f6e280b426c38f6b6559934753b34b614c399710.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/erl_distribution.erl1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/kernel/src/erl_distribution.erl b/lib/kernel/src/erl_distribution.erl
index 25ad34357a..3c4429129e 100644
--- a/lib/kernel/src/erl_distribution.erl
+++ b/lib/kernel/src/erl_distribution.erl
@@ -22,7 +22,6 @@
-export([start_link/0,start_link/1,init/1,start/1,stop/0]).
-%-define(DBG,io:format("~p:~p~n",[?MODULE,?LINE])).
-define(DBG,erlang:display([?MODULE,?LINE])).
start_link() ->