Learn more about cloning repositories
You have read-only access
Merge pull request #1176 from pkarw/master Fix of wrongly resolved conflict ;P