merged conflicting stuff. Added 'me' tag

[zzz-floof.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b0cc08d..abc747b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,7 @@
 *.pyc
 
 *.db
+*.egg/
 *.egg-info/
 data/
+/floof/public/art/*