diff options
| author | Paul Phillips <paulp@improving.org> | 2013-05-26 19:09:19 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-26 19:13:01 -0700 |
| commit | ac6504b8c43b83e43072d76d9a6fae0993f88d8e (patch) | |
| tree | e35cc8091b97b27bcc07e716a341a44476d65c39 /gitignore.SAMPLE | |
| parent | 41073f8db662906ada4b779f199ea6d5f4bd5e1f (diff) | |
| download | scala-ac6504b8c43b83e43072d76d9a6fae0993f88d8e.tar.gz scala-ac6504b8c43b83e43072d76d9a6fae0993f88d8e.tar.bz2 scala-ac6504b8c43b83e43072d76d9a6fae0993f88d8e.zip | |
Temporary reversion of a bit of d8b96bb858.
If I reverse these few lines, I can rebase miguel's
pull request cleanly; if I don't, git thinks there are
enough merge conflicts to start a war. Something is
suboptimal in that algorithm.
Diffstat (limited to 'gitignore.SAMPLE')
0 files changed, 0 insertions, 0 deletions