summaryrefslogtreecommitdiffstats
path: root/templates/authopenid/external_legacy_login_info.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/authopenid/external_legacy_login_info.html')
-rw-r--r--templates/authopenid/external_legacy_login_info.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html
index e2f4713e..dda394c7 100644
--- a/templates/authopenid/external_legacy_login_info.html
+++ b/templates/authopenid/external_legacy_login_info.html
@@ -8,9 +8,14 @@
</div>
{% spaceless %}
<div class="message">
+<<<<<<< HEAD:templates/authopenid/external_legacy_login_info.html
fill in template templates/authopenid/external_legacy_login_info.html
and explain how to change password, recover password, etc.
<!--add info about your external login site here-->
+=======
+<!--add info about your external login site here-->
+{% trans "how to login with password through external login website" %}
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/authopenid/external_legacy_login_info.html
</div>
{% endspaceless %}
{% endblock %}