summaryrefslogtreecommitdiffstats
path: root/templates/authopenid/complete.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/authopenid/complete.html')
-rw-r--r--templates/authopenid/complete.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index 9a94c3c4..e3c12ae5 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -88,6 +88,10 @@ parameters:
</div>
<p class='nomargin'>{% trans "receive updates motivational blurb" %}</p>
{% include "edit_user_email_feeds_form.html" %}
+<<<<<<< HEAD:templates/authopenid/complete.html
+=======
+ <p class='nomargin'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p>
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/authopenid/complete.html
<div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
</form>
</div>