mirror of
https://github.com/KLayout/klayout.git
synced 2026-08-29 09:20:45 +02:00
git merge failed, probably because there were two parallel attempts to merge master into pymod leading to opposite resolutions.
git merge failed, probably because there were two parallel attempts to merge master into pymod leading to opposite resolutions.