aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-14 11:54:59 +0200
committerIngela Anderton Andin <[email protected]>2016-06-14 11:54:59 +0200
commit481ac2a246c53c29033648ae5adda2c215fcc924 (patch)
tree99f35fb7bebfa4023c8456b889d67796e1c670b0 /make
parent0e017b887316f635fedd1323c82c2850cb6d68cd (diff)
parent982b7072a84ebf35cede69f14300ba9457798ddc (diff)
downloadotp-481ac2a246c53c29033648ae5adda2c215fcc924.tar.gz
otp-481ac2a246c53c29033648ae5adda2c215fcc924.tar.bz2
otp-481ac2a246c53c29033648ae5adda2c215fcc924.zip
Merge branch 'ingela/public_key/merge-conflic-resolution'
* ingela/public_key/merge-conflic-resolution: public_key: Add missing comma form merge commit 5268c7b957c30c31e551f197463cdd55a792ea69
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions