Replace custom merge driver with built-in merge=ours - #146

Replace custom merge driver with built-in merge=ours#146

blooop merged 2 commits into

mainblooop/python_template:mainfrom

feature/mergedriverblooop/python_template:feature/mergedriverCopy head branch name to clipboard