tree 3a825b880b8fe01bd6e6f8e18a10a2ba41229d8f
parent f953339bd9c4a70d97593503980bd57d928e15f3
author Stephan Herrmann <stephan.herrmann@berlin.de> 1605215007 +0100
committer Stephan Herrmann <stephan.herrmann@berlin.de> 1605215007 +0100

fix regressions after merge

- conflict at modifier non-sealed vs callin modifiers
- copy OT-additions to TypeDeclaration.PROPERTY_DESCRIPTORS_15 (dom)