Fix: conflict config.py
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 9 Sep 2013 09:27:22 +0000 (11:27 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 9 Sep 2013 09:27:22 +0000 (11:27 +0200)
commitee60f435987235b078b8b4693a3f916e1fdb83a8
tree7ec261c5e2883be3cdbcdd09e211ce825e5aad88
parent1aea42c3668602aacfe22bc762ee939672129f53
parent94979dc79b2e0af6a4b5d131c0159872c3ab7135
Fix: conflict config.py
myslice/config.py