Alternative conflict resolutions after repository conversion for the translation bot#33

cameel wants to merge 2 commits intodevelopsolidity-docs/fa-persian:developfrom

alternative-conflict-resolutionssolidity-docs/fa-persian:alternative-conflict-resolutionsCopy head branch name to clipboard