Pranjal Yadav has proposed merging lp:~godricglow/postorius/bug_fix into
lp:postorius.
Requested reviews:
Mailman Coders (mailman-coders)
For more details, see:
https://code.launchpad.net/~godricglow/postorius/bug_fix/+merge/247310
Django template for login page was not rendering properly due to missplaced new
line character
--
Your team Mailman Coders is requested to review the proposed merge of
lp:~godricglow/postorius/bug_fix into lp:postorius.
=== modified file 'src/postorius/templates/postorius/login.html'
--- src/postorius/templates/postorius/login.html 2015-01-17 17:23:59 +0000
+++ src/postorius/templates/postorius/login.html 2015-01-22 15:44:23 +0000
@@ -23,11 +23,17 @@
<input type="hidden" name="assertion" value="" />
<a rel="nofollow" id="browserid" href="#"><img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="{% trans 'Login using BrowserID' %}" /></a>
</form>
+<<<<<<< TREE
<p>{% trans "Mozilla Persona is an easy way to sign into multiple websites, while
still controlling your personal data. For more information <a
href='http://www.mozilla.org/en-US/persona'>see the Mozilla website</a>" %}.</p>
<noscript><p class="text-error">{% trans "Mozilla Persona requires the use of
JavaScript." %}</p></noscript>
+=======
+ <p>Mozilla Persona is an easy way to sign into multiple websites, while still controlling your personal data. For more information <a href="http://www.mozilla.org/en-US/persona";>see the mozilla website</a>.</p>
+ <noscript><p class="text-error">Mozilla Persona requires the use of
+JavaScript.</p></noscript>
+>>>>>>> MERGE-SOURCE
</div>
<div style="clear:both">
</div>
_______________________________________________
Mailman-coders mailing list
Mailman-coders@python.org
https://mail.python.org/mailman/listinfo/mailman-coders
