Fix: merge conflict def def account_process(): in views.py
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 4 Sep 2013 13:49:21 +0000 (15:49 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 4 Sep 2013 13:49:21 +0000 (15:49 +0200)
commit02a6c1aea215c598d92bdcd37d19652800a6d156
treee59240ce322e9bce085491e7a0232bb22be03f69
parent509a6f439d2d79c95d7dc6a0db34fcd2e1cf235f
parent5fa503e8ad5b16353ddb8b88eaa914c7a4ee5748
Fix: merge conflict def def account_process(): in views.py
portal/templates/my_account.html
portal/views.py