aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-18 13:11:13 +0100
committerZandra Hird <[email protected]>2015-03-18 13:11:13 +0100
commit6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c (patch)
tree0bb89aca2a1a253176c3568870ff7d1cf4dbc294 /lib/kernel/src
parent2993e322c6d458e63376fbdbb97fac847fde50e4 (diff)
parentf342f277ff0573d06be083d50e6e5fa2d57263a9 (diff)
downloadotp-6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c.tar.gz
otp-6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c.tar.bz2
otp-6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c.zip
Merge branch 'wmalik/minor-fixes' into maint
* wmalik/minor-fixes: Fix proc_lib doc Remove commented out code Fix make_hash description
Diffstat (limited to 'lib/kernel/src')
-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() ->