bug 1138: fixed merge conflict and white spaces indentation
authorINOPIAE <inopiae@cacert.org>
Sat, 11 Jan 2014 23:06:46 +0000 (00:06 +0100)
committerINOPIAE <inopiae@cacert.org>
Sat, 11 Jan 2014 23:06:46 +0000 (00:06 +0100)
commit1e8d8add953809e655f82b3f33a0e3cdadb1f0e6
tree9f7b62b35ac68b6964dd28643b489ef34d2dc054
parent499b1281956490bb2f4d243e3b04686444a79816
bug 1138: fixed merge conflict and white spaces indentation
pages/account/43.php