Fix: conflict in rest api
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 26 Feb 2014 18:04:12 +0000 (19:04 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 26 Feb 2014 18:04:12 +0000 (19:04 +0100)
commit4149daccbc632ff4f3af01ea359897bae021a0f6
treefaaf41375d1d7e80da0c96e2b1e83633451557e7
parent16c948cbc41f745569c6fbd4014cc7bd92d92844
parentc78cba16c3004d7b2067408ecdd5fe932b6e4fd0
Fix: conflict in rest api
rest/__init__.py