summaryrefslogtreecommitdiff
path: root/doc/merge.txt
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2016-08-18 14:34:26 +0200
committerLinus Nordberg <linus@nordu.net>2016-08-18 14:46:26 +0200
commita4ef2ba028f9f3ba43a15934cb1ab95cad94cfa2 (patch)
tree218041e36eda56106ae9d061143d5f9a71a4aac9 /doc/merge.txt
parent31e1927e1a163c72360b2aea8f87701e4da2a6fb (diff)
Use erlang:timestamp/0 instead of deprecated now/0.
Diffstat (limited to 'doc/merge.txt')
0 files changed, 0 insertions, 0 deletions