aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <sverker@erlang.org>2011-07-13 14:32:01 +0200
committerSverker Eriksson <sverker@erlang.org>2011-07-13 14:32:01 +0200
commit88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b (patch)
tree79efb4fce91f3413974dbd5db9627b567420bffb /erts
parent74e7bf593c302dccd2df1561a22ad25b91a4864b (diff)
downloadotp-88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b.tar.gz
otp-88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b.tar.bz2
otp-88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b.zip
Correct merge conflict mistake in parent
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/nif_SUITE_data/nif_SUITE.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index f47b635a70..bdf1549862 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -1466,7 +1466,7 @@ static ErlNifFunc nif_funcs[] =
{"join_send_thread", 1, join_send_thread},
{"copy_blob", 1, copy_blob},
{"send_term", 2, send_term},
- {"reverse_list",1, reverse_list}
+ {"reverse_list",1, reverse_list},
{"echo_int", 1, echo_int},
{"type_sizes", 0, type_sizes}
};