.gitignore: fixup bad merge step
authorBrian Norris <banorris@uci.edu>
Mon, 21 May 2012 04:20:17 +0000 (21:20 -0700)
committerBrian Norris <banorris@uci.edu>
Mon, 21 May 2012 04:20:17 +0000 (21:20 -0700)
commit5d742590c334d40f63f08b42d6eb4ef9bb822103
treef64f13d0b932bd90a1eae8669e1941ade59ec067
parent607a6be09a7e5d8cbf29943dbd5bef09619e5f84
.gitignore: fixup bad merge step

(You don't need both the *~ and *.*~ rules)
.gitignore