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)
commit1aea42c3668602aacfe22bc762ee939672129f53
tree60eb4112cfe6d7781437476e53473fdb62c51199
parente937c0d12ce2e9f3f37eebc0afde6ec0960ab8c1
parent0098d38aa259c2aeeac53c5fc0a91acefa8f0ee7
FIX: conflict in settings.py
myslice/config.py