Bug 1489550 Remove a stray merge file that got commited r=dminor

Differential Revision: https://phabricator.services.mozilla.com/D5281

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Ritter 2018-09-07 17:46:47 +00:00
parent 8521aaefbd
commit 9653a5e959

File diff suppressed because it is too large Load Diff