MDL-63692 message: Resolve bad merge conflict
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Nov 2018 01:02:16 +0000 (09:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Nov 2018 01:04:53 +0000 (09:04 +0800)
commit2f7076ebf2c3d107466925979022deade822272b
tree237977f3b409ef2dd286cf4d371019a6ba8a1561
parent08cd15658a29a720ff69b676c3ec12e48d437d2e
MDL-63692 message: Resolve bad merge conflict
message/classes/api.php