Error during merge to local
Created originally on Bitbucket by Anonymous
This happened after committing local changes, pull from repository and trying to merge with local. Just one changed file in my commit, and it was not changed in repository
Attachments: bugreport.txt