rename problematic merged schema so it won't stop the build

This commit is contained in:
Mark Pictor 2013-09-20 12:03:39 -04:00
parent e1f0a6a7ee
commit 335ccf9712