Commit 1f5d59a2 authored by Panda Mery's avatar Panda Mery

Trying to resolve some merge issues

parent 4e4346ad
Pipeline #72349591 passed with stage
in 48 seconds
<<<<<<< HEAD
<!DOCTYPE html><head><meta charset="utf-8" /><title>Contact — evalapply</title><link rel="stylesheet" href="/css/reset.css" /><link rel="stylesheet" href="/css/fonts.css" /><link rel="stylesheet" href="/css/evalapply.css" /></head><body><div class="container"><div class="nav"><ul><li><a href="/">EvalApply</a></li><li class="fade-text"> </li><li><a href="/sicp.html">SICP</a></li><li><a href="/resources.html">Resources</a></li><li><a href="/come-along.html">Come along</a></li><li><a href="/conduct.html">Code of conduct</a></li><li><a href="/contact.html">Contact</a></li></ul></div><h2>Contact</h2><p>EvalApply was started by Daniel, Neil, &amp; <a href="https://gizmonaut.net">Panda</a> in May 2019.</p><p>We can be reached at <a href="mailto:lambda@evalapply.space">lambda@evalapply.space</a></p><footer class="text-center"><p class="copyright">© 2019 EvalApply<a class="cc-button" href="https://creativecommons.org/licenses/by-sa/4.0/"><img src="https://licensebuttons.net/l/by-sa/4.0/80x15.png" /></a></p><p>The text and images on this site are
=======
<!DOCTYPE html><head><meta charset="utf-8" /><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" /><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" /><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" /><link rel="manifest" href="/site.webmanifest" /><meta name="msapplication-TileColor" content="#da532c" /><meta name="theme-color" content="#ffffff" /><title>Contact — evalapply</title><link rel="stylesheet" href="/css/reset.css" /><link rel="stylesheet" href="/css/fonts.css" /><link rel="stylesheet" href="/css/evalapply.css" /></head><body><div class="container"><div class="nav"><ul><li><a href="/">EvalApply</a></li><li class="fade-text"> </li><li><a href="/sicp.html">SICP</a></li><li><a href="/resources.html">Resources</a></li><li><a href="/come-along.html">Come along</a></li><li><a href="/conduct.html">Code of conduct</a></li><li><a href="/contact.html">Contact</a></li></ul></div><h2>Contact</h2><p>EvalApply was started by Daniel, Neil, &amp; Panda in May 2019.</p><p>We can be reached at <a href="mailto:lambda@evalapply.space">lambda@evalapply.space</a></p><footer class="text-center"><p class="copyright">© 2019 EvalApply<a class="cc-button" href="https://creativecommons.org/licenses/by-sa/4.0/"><img src="https://licensebuttons.net/l/by-sa/4.0/80x15.png" /></a></p><p>The text and images on this site are
>>>>>>> b2799db8bee94ad8b0a07a057269c93b1539726c
<!DOCTYPE html><head><meta charset="utf-8" /><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" /><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" /><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" /><link rel="manifest" href="/site.webmanifest" /><meta name="msapplication-TileColor" content="#da532c" /><meta name="theme-color" content="#ffffff" /><title>Contact — evalapply</title><link rel="stylesheet" href="/css/reset.css" /><link rel="stylesheet" href="/css/fonts.css" /><link rel="stylesheet" href="/css/evalapply.css" /></head><body><div class="container"><div class="nav"><ul><li><a href="/">EvalApply</a></li><li class="fade-text"> </li><li><a href="/sicp.html">SICP</a></li><li><a href="/resources.html">Resources</a></li><li><a href="/come-along.html">Come along</a></li><li><a href="/conduct.html">Code of conduct</a></li><li><a href="/contact.html">Contact</a></li></ul></div><h2>Contact</h2><p>EvalApply was started by Daniel, Neil, &amp; <a href="https://gizmonaut.net">Panda</a> in May 2019.</p><p>We can be reached at <a href="mailto:lambda@evalapply.space">lambda@evalapply.space</a></p><footer class="text-center"><p class="copyright">© 2019 EvalApply<a class="cc-button" href="https://creativecommons.org/licenses/by-sa/4.0/"><img src="https://licensebuttons.net/l/by-sa/4.0/80x15.png" /></a></p><p>The text and images on this site are
free culture works available under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution Share-Alike 4.0 International</a> license.</p><p>This website is built with <a href="http://haunt.dthompson.us">Haunt</a>, a static site generator written in <a href="https://gnu.org/software/guile">Guile Scheme</a>.</p></footer></div></body>
\ No newline at end of file
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><title>evalapply</title><id>https://evalapply.space/feed.xml</id><subtitle>Recent Posts</subtitle><updated>2019-07-23T00:40:00+0200</updated><link href="evalapply.space/feed.xml" rel="self" /><link href="evalapply.space" /><entry><title>First post!</title><id>https://evalapply.space/first-post.html</id><author><name>Eval Apply</name><email>lambda@evalapply.space</email></author><updated>2019-06-18T21:00:00+0200</updated><link href="https://evalapply.space/first-post.html" rel="alternate" /><summary type="html">&lt;p&gt;Hello, world!&lt;/p&gt;</summary></entry></feed>
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><title>evalapply</title><subtitle>Recent Posts</subtitle><updated>2019-07-22T21:48:11+0100</updated><link href="evalapply.space/feed.xml" rel="self" /><link href="evalapply.space" /><entry><title>First post!</title><author><name>Eval Apply</name><email>lambda@evalapply.space</email></author><updated>2019-06-18T21:00:00+0100</updated><link href="/first-post.html" rel="alternate" /><summary type="html">&lt;p&gt;Hello, world!&lt;/p&gt;</summary></entry></feed>
>>>>>>> b2799db8bee94ad8b0a07a057269c93b1539726c
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><title>evalapply</title><id>https://evalapply.space/feed.xml</id><subtitle>Recent Posts</subtitle><updated>2019-07-23T00:46:15+0200</updated><link href="evalapply.space/feed.xml" rel="self" /><link href="evalapply.space" /><entry><title>First post!</title><id>https://evalapply.space/first-post.html</id><author><name>Eval Apply</name><email>lambda@evalapply.space</email></author><updated>2019-06-18T21:00:00+0200</updated><link href="https://evalapply.space/first-post.html" rel="alternate" /><summary type="html">&lt;p&gt;Hello, world!&lt;/p&gt;</summary></entry></feed>
\ No newline at end of file
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><title>evalapply</title><id>https://evalapply.space/feeds/tags/hello.xml</id><subtitle>Tag: hello</subtitle><updated>2019-07-23T00:40:00+0200</updated><link href="evalapply.space/feeds/tags/hello.xml" rel="self" /><link href="evalapply.space" /><entry><title>First post!</title><id>https://evalapply.space/first-post.html</id><author><name>Eval Apply</name><email>lambda@evalapply.space</email></author><updated>2019-06-18T21:00:00+0200</updated><link href="https://evalapply.space/first-post.html" rel="alternate" /><summary type="html">&lt;p&gt;Hello, world!&lt;/p&gt;</summary></entry></feed>
=======
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><title>evalapply</title><subtitle>Tag: hello</subtitle><updated>2019-07-22T21:48:11+0100</updated><link href="evalapply.space/feeds/tags/hello.xml" rel="self" /><link href="evalapply.space" /><entry><title>First post!</title><author><name>Eval Apply</name><email>lambda@evalapply.space</email></author><updated>2019-06-18T21:00:00+0100</updated><link href="/first-post.html" rel="alternate" /><summary type="html">&lt;p&gt;Hello, world!&lt;/p&gt;</summary></entry></feed>
>>>>>>> b2799db8bee94ad8b0a07a057269c93b1539726c
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><title>evalapply</title><id>https://evalapply.space/feeds/tags/hello.xml</id><subtitle>Tag: hello</subtitle><updated>2019-07-23T00:46:15+0200</updated><link href="evalapply.space/feeds/tags/hello.xml" rel="self" /><link href="evalapply.space" /><entry><title>First post!</title><id>https://evalapply.space/first-post.html</id><author><name>Eval Apply</name><email>lambda@evalapply.space</email></author><updated>2019-06-18T21:00:00+0200</updated><link href="https://evalapply.space/first-post.html" rel="alternate" /><summary type="html">&lt;p&gt;Hello, world!&lt;/p&gt;</summary></entry></feed>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment