Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
10 lines (9 sloc) 117 Bytes
<<<<<<< HEAD
*.pyc
*.db
=======
*.log
*.pot
*.pyc
local_settings.py
>>>>>>> 1598990eeb050ae6fba405cda7bf5e81395a8add