]> source.dussan.org Git - gitignore.git/commitdiff
Merge pull request #161 from cboutter/master
authorChris Wanstrath <chris@ozmm.org>
Thu, 1 Sep 2011 23:54:30 +0000 (16:54 -0700)
committerChris Wanstrath <chris@ozmm.org>
Thu, 1 Sep 2011 23:54:30 +0000 (16:54 -0700)
Added a newline at end of the Mercurial and Java files in order to build a gitignore file from multiple templates.


Trivial merge