Skip to content

Commit

Permalink
resolve a merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
pkrumins committed Mar 3, 2015
2 parents 372561d + d8b24ba commit 31fc099
Showing 1 changed file with 54 additions and 54 deletions.
108 changes: 54 additions & 54 deletions catonmat/templates/header.tmpl.html
@@ -1,54 +1,54 @@
<div id="tabs">
<ul>
<li><a href="/" title="Return to homepage/blog">Home</a></li>
<li><a href="/books/" title="Books that Peteris krumins has written">Books</a></li>
<li><a href="/projects/" title="Projects that Peteris Krumins has done">Projects</a></li>
<li><a href="/sitemap/" title="Catonmat sitemap">Sitemap</a></li>
<li><a href="/feedback/" title="Contact Peteris Krumins/Leave feedback">Feedback</a></li>
<li><a href="/about/" title="About Peteris Krumins">About Me</a></li>
<li><a class="advertise" href="/consulting/" title="Consulting">Consulting</a></li>
<li><a class="advertise" href="/advertise/" title="Advertise on catonmat.net">Advertising</a></li>
</ul>
<!--
<div id="tab-ad">
</div>
-->
</div>
<div class="clear"></div>
<div id="hspace">
<div id="first">
<a href="/" class="wide" title="Return to good coders code, great reuse">
<img src="/static/img/good-coders-code-great-reuse.gif" alt="good coders code, great reuse">
</a>
<div id="first-real">
<table width="100%" height="145" valign="middle">
<tr>
<td>
<p class="quote">${quote.quote}</p>
<!-- <span class="quotes"><a href="/quotes/" title="more programming related quotes">more quotes</a></span>-->
<p class="author">${quote.author}</p>
</td>
</tr>
</table>
</div>
</div>
<div id="second">
<div id="second-real">
<div id="announcements">
<div id="browserling">
<p class="title"><a href="http://www.catonmat.net/blog/launching-browserling/" title="I am doing a startup!">I am doing a startup!</a></p>
<p class="browserling-logo"><a href="http://www.browserling.com" title="Browserling"><img src="/static/img/browserling-logo-180px.png" alt="Browserling"></a></p>
<p>Cross-browser testing from your browser!</p>
</div>
<div id="books">
<p class="title"><a href="http://www.catonmat.net/blog/perl-one-liners-no-starch-press/">I have written my fourth book!</a>
<p class="awk-logo"><a href="http://www.catonmat.net/blog/perl-one-liners-no-starch-press/" title="Perl One-Liners by No Starch Press"><img src="/static/img/perl-book-no-starch-press-180x61.png" alt="Perl Book"></a></p>
<p>Be faster than Larry Wall at command line!</p>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<div class="clear"></div>
</div>
<div id="tabs">
<ul>
<li><a href="/" title="Return to homepage/blog">Home</a></li>
<li><a href="/books/" title="Books that Peteris krumins has written">Books</a></li>
<li><a href="/projects/" title="Projects that Peteris Krumins has done">Projects</a></li>
<li><a href="/sitemap/" title="Catonmat sitemap">Sitemap</a></li>
<li><a href="/feedback/" title="Contact Peteris Krumins/Leave feedback">Feedback</a></li>
<li><a href="/about/" title="About Peteris Krumins">About Me</a></li>
<li><a class="advertise" href="/consulting/" title="Consulting">Consulting</a></li>
<li><a class="advertise" href="/advertise/" title="Advertise on catonmat.net">Advertising</a></li>
</ul>
<!--
<div id="tab-ad">
</div>
-->
</div>
<div class="clear"></div>
<div id="hspace">
<div id="first">
<a href="/" class="wide" title="Return to good coders code, great reuse">
<img src="/static/img/good-coders-code-great-reuse.gif" alt="good coders code, great reuse">
</a>
<div id="first-real">
<table width="100%" height="145" valign="middle">
<tr>
<td>
<p class="quote">${quote.quote}</p>
<!-- <span class="quotes"><a href="/quotes/" title="more programming related quotes">more quotes</a></span>-->
<p class="author">${quote.author}</p>
</td>
</tr>
</table>
</div>
</div>
<div id="second">
<div id="second-real">
<div id="announcements">
<div id="browserling">
<p class="title"><a href="http://www.catonmat.net/blog/launching-browserling/" title="I am doing a startup!">I am doing a startup!</a></p>
<p class="browserling-logo"><a href="http://www.browserling.com" title="Browserling"><img src="/static/img/browserling-logo-180px.png" alt="Browserling"></a></p>
<p>Cross-browser testing from your browser!</p>
</div>
<div id="books">
<p class="title"><a href="http://www.catonmat.net/blog/perl-one-liners-no-starch-press/">I have written my fourth book!</a>
<p class="awk-logo"><a href="http://www.catonmat.net/blog/perl-one-liners-no-starch-press/" title="Perl One-Liners by No Starch Press"><img src="/static/img/perl-book-no-starch-press-180x61.png" alt="Perl Book"></a></p>
<p>Be faster than Larry Wall at command line!</p>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<div class="clear"></div>
</div>

0 comments on commit 31fc099

Please sign in to comment.