Disable the Resolve Conflicts and Conflicts Resolved actions
[nbgit/imyousuf.git] / .gitignore
blob2d6a7315a709c8a32ba517bb9ec83720e416e463
1 build/
2 nbproject/private/