Improve handling of inline annotations without conflicts#66

lagru merged 2 commits intomainscientific-python/docstub:mainfrom

no-note-inline-attributesscientific-python/docstub:no-note-inline-attributesCopy head branch name to clipboard