Closed WilDoane closed 13 years ago
Solved in commits that redirect the test output to temp/ and add temp/ to .gitignore (respectively): https://github.com/briandk/granova/commit/66ede28eeb122468e7ffe8440bb19451e8e02f5a
https://github.com/briandk/granova/commit/66e37ef25a77059a4fb5de93d4e0dbf166343615
otherwise changes to pdf and other test output is being pushed to the repo and causing merge conflicts.