# binaires
*.pyc
*.pyo

# Fichier temporaires:
.*.swp
*~
\#*#
src/*

# DB de dev
*.db

# restants de merge
*.orig
*.rej

# Configuration du projet - par environnement
conf.py
django.wsgi
local.cfg

# buildout
.installed.cfg
bin
develop-eggs
downloads
eggs
log
parts
tmp

# extra
project/media_prive/*
<<<<<<< HEAD
project/static/*
=======
project/static
>>>>>>> master