Christopher Aedo b19cc91624 Revert "Keep assets_merge.yaml"
This reverts commit d43bc0a0281fccc96d9d19de658341cbc6686eea.

No longer needed, issue was resolved with https://review.openstack.org/358909

Change-Id: Ib8b9adcecc36fd582a3d4f393833ac86d4179424
2016-08-31 00:09:00 +00:00
..
2015-09-01 09:23:00 -07:00