Merge pull request #79 from tsloughter/master

18.0 Support
2015-04-23 16:16:34 -07:00 · 2015-04-23 16:16:34 -07:00 · ef0d252b11
commit ef0d252b11
parent 05b956da26 7015ba2951
3 changed files with 7 additions and 7 deletions
--- a/src/ec_date.erl
+++ b/src/ec_date.erl
@ -931,7 +931,7 @@ iso_test_() ->
    ].

 ms_test_() ->
-    Now=now(),
+    Now=os:timestamp(),
    [
     ?_assertEqual({{2012,12,12}, {12,12,12,1234}}, parse("2012-12-12T12:12:12.1234")),
     ?_assertEqual(format("H:m:s.f \\m \\i\\s \\m\\o\\n\\t\\h",?DATEMS),