git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: merge conflict def def account_process(): in views.py
[myslice.git]
/
portal
/
templates
/
my_account.html
diff --git
a/portal/templates/my_account.html
b/portal/templates/my_account.html
index
1d5f2e2
..
75cb11f
100644
(file)
--- a/
portal/templates/my_account.html
+++ b/
portal/templates/my_account.html
@@
-40,7
+40,7
@@
<div class='ms-dashboard-content' id='tophat__list__user_hrn'>
<div id="main">
<div id="middle" align="center">
<div class='ms-dashboard-content' id='tophat__list__user_hrn'>
<div id="main">
<div id="middle" align="center">
- <form id="editForm" method="POST" action="acc_process" enctype="multipart/form-data">
+ <form id="editForm" method="POST" action="acc
ount
_process" enctype="multipart/form-data">
{% csrf_token %}
<table class="profile">
<tr class="odd">
{% csrf_token %}
<table class="profile">
<tr class="odd">