aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-01-19 00:46:21 +0100
committerRickard Green <[email protected]>2013-01-19 00:46:21 +0100
commit6347bc07dac9f958b4ac3cb751dabae08d350b8b (patch)
tree2b9d9536d6c889582268e8934d7748f8b54bf1b5
parentb15688d40d5147c1122aaad3b82495fbbc4dede8 (diff)
downloadotp-6347bc07dac9f958b4ac3cb751dabae08d350b8b.tar.gz
otp-6347bc07dac9f958b4ac3cb751dabae08d350b8b.tar.bz2
otp-6347bc07dac9f958b4ac3cb751dabae08d350b8b.zip
Fix merge conflict with hasse
-rw-r--r--lib/stdlib/src/io_lib.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 0f1f417d01..513d904c39 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -276,7 +276,7 @@ write_atom(Atom) ->
Chars = atom_to_list(Atom),
case quote_atom(Atom, Chars) of
true ->
- write_unicode_string(Chars, $'); %'
+ write_string(Chars, $'); %'
false ->
Chars
end.