From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 15 Apr 2012 07:19:25 +0000 (-0700)
Subject: add zip to git ignore, and fix gh-pages make
X-Git-Tag: v2.0.3~5^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e985681758c3fef534f5bbe86c12b884a8333cbe;p=thirdparty%2Fbootstrap.git

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

diff --git a/.gitignore b/.gitignore
index 5e8b7abb9e..4086ceec52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.rej
 *.swo
 *.swp
+*.zip
 *.vi
 *~
 *.sass-cache
diff --git a/Makefile b/Makefile
index 038629468d..78d1a84079 100644
--- 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