Merge pull request #104 from pnorman/patch-1
[potlatch2.git] / .gitignore
index b07f606..4bdb2fc 100644 (file)
@@ -1,3 +1,4 @@
+.DS_Store
 build.properties
 l10n/locale/bundles
 version.as
@@ -9,6 +10,7 @@ resources/*.swf
 resources/*.cache
 resources/docs
 resources/mapquest
+resources/generated
 
 /tests/bin/
 /tests/report/