- The #748 had some kind of a hidden merge conflict with the #806, which was merged earlier. Both PRs added the same lines into the
.gitignore
file:
0*.log
1*.trs
To de-duplicate these lines, it seems the easiest way is to revert the smallest commit.
- The
!.gitignore
line was introduced in a16c3a905bbb56f667684d17b80c30e96f961620 for theobj/.gitignore
file. Theobj
directory has been unused since 78cd96b15153e209cf4829a511f9efdfdcf7e4d0.