Merge pull request #161 from cboutter/master

defunkt · defunkt · commit d9fb955d92e2 · 2011-09-01T16:54:30.000-07:00
Added a newline at end of the Mercurial and Java files in order to build a gitignore file from multiple templates.
diff --git a/Global/Mercurial.gitignore b/Global/Mercurial.gitignore
@@ -1,3 +1,3 @@
 /.hg/*
 */.hg/*
-.hgignore
+.hgignore
diff --git a/Java.gitignore b/Java.gitignore
@@ -1 +1 @@
-*.class
+*.class

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 /.hg/*
 */.hg/*
 -.hgignore
 +.hgignore