FIX: conflict in settings.py
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 9 Sep 2013 09:21:40 +0000 (11:21 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 9 Sep 2013 09:21:40 +0000 (11:21 +0200)

No differences found