Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

[bootswatch] / .gitignore

diff --git a/.gitignore b/.gitignore
index 05aa84c..255ba43 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 components
 node_modules
 build
+/CNAME\r
+/CNAME\r