This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Fix merging media type#60

Open

monikma wants to merge 4 commits intoraml-org:masterfrom monikma:fix_merging_media_type

+157-15

Commits on Mar 30, 2015

fixed handling merging default media type keys with existing media type keys
Monika Machunik | hybris
committed
fixed the order of applying media type keys, extended the test
Monika Machunik | hybris
committed

Commits on Apr 2, 2015

added some corner case test and improved the code
Monika Machunik | hybris
committed
wrong merge
Monika Machunik | hybris
committed