aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-07-13 14:32:01 +0200
committerSverker Eriksson <[email protected]>2011-07-13 14:32:01 +0200
commit88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b (patch)
tree79efb4fce91f3413974dbd5db9627b567420bffb /AUTHORS
parent74e7bf593c302dccd2df1561a22ad25b91a4864b (diff)
downloadotp-88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b.tar.gz
otp-88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b.tar.bz2
otp-88df4cc3b8f15f4aa621117ad99fd43fafe5dc5b.zip
Correct merge conflict mistake in parent
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions