add zip to git ignore, and fix gh-pages make

e9856817 · Jacob Thornton · 2a6894d8 · e9856817 · e9856817
Commit e9856817 authored Apr 15, 2012 by Jacob Thornton
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.gitignore .gitignore +1 -0

Makefile Makefile +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.rej
 *.swo
 *.swp
+*.zip
 *.vi
 *~
 *.sass-cache

--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ bootstrap:
 #

 gh-pages: bootstrap docs
-	rm docs/assets/bootstrap.zip
+	rm -f docs/assets/bootstrap.zip
 	zip -r docs/assets/bootstrap.zip bootstrap
 	rm -r bootstrap
 	rm -f ../bootstrap-gh-pages/assets/bootstrap.zip