* ChangeLog: Remove conflict markers.
[pspp] / .gitignore
1 testdir*