Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
davorg committed Aug 17, 2014
2 parents 6364785 + d06a867 commit e08cbd3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions c/battersea.html
Expand Up @@ -62,8 +62,8 @@ <h1>Battersea</h1>
</div>
<div class="col-md-4">
<ul>
<li>Jane Ellison (Conservative)<br><a href="https://twitter.com/janeellisonmp>@janeellisonmp</a></li>
<li>Will Martindale (Labour)<br><a href="https://twitter.com/WillJMartindale>@WillJMartindale</a></li>
<li>Jane Ellison (Conservative)<br><a href="https://twitter.com/janeellisonmp">@janeellisonmp</a></li>
<li>Will Martindale (Labour)<br><a href="https://twitter.com/WillJMartindale">@WillJMartindale</a></li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion c/clacton.html
Expand Up @@ -62,7 +62,7 @@ <h1>Clacton</h1>
</div>
<div class="col-md-4">
<ul>
<li>Douglas Carswell (Conservative)<br><a href="https://twitter.com/DouglasCarswell>@DouglasCarswell</a></li>
<li>Douglas Carswell (Conservative)<br><a href="https://twitter.com/DouglasCarswell">@DouglasCarswell</a></li>
</ul>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions c/mid-bedfordshire.html
Expand Up @@ -62,8 +62,8 @@ <h1>Mid Bedfordshire</h1>
</div>
<div class="col-md-4">
<ul>
<li>Nadine Dorries (Conservative)<br><a href="https://twitter.com/NadineDorriesMP>@NadineDorriesMP</a></li>
<li>Charlynne Pullen (Labour)<br><a href="https://twitter.com/CharlynnePullen>@CharlynnePullen</a></li>
<li>Nadine Dorries (Conservative)<br><a href="https://twitter.com/NadineDorriesMP">@NadineDorriesMP</a></li>
<li>Charlynne Pullen (Labour)<br><a href="https://twitter.com/CharlynnePullen">@CharlynnePullen</a></li>
</ul>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions c/tooting.html
Expand Up @@ -62,8 +62,8 @@ <h1>Tooting</h1>
</div>
<div class="col-md-4">
<ul>
<li>Dan Watkins (Conservative)<br><a href="https://twitter.com/DanWatkins>@DanWatkins</a></li>
<li>Sadiq Khan (Labour)<br><a href="https://twitter.com/SadiqKhan>@SadiqKhan</a></li>
<li>Dan Watkins (Conservative)<br><a href="https://twitter.com/DanWatkins">@DanWatkins</a></li>
<li>Sadiq Khan (Labour)<br><a href="https://twitter.com/SadiqKhan">@SadiqKhan</a></li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ttlib/page.tt
Expand Up @@ -63,7 +63,7 @@ body {
<div class="col-md-4">
<ul>
[% FOREACH cand IN c.candidates -%]
<li>[% cand.name %] ([% cand.party.name %])[% IF cand.twitter %]<br><a href="https://twitter.com/[% cand.twitter %]>@[% cand.twitter %]</a>[% END %]</li>
<li>[% cand.name %] ([% cand.party.name %])[% IF cand.twitter %]<br><a href="https://twitter.com/[% cand.twitter %]">@[% cand.twitter %]</a>[% END %]</li>
[% END -%]
</ul>
</div>
Expand Down

0 comments on commit e08cbd3

Please sign in to comment.