diff options
Diffstat (limited to 'article/index.html')
| -rw-r--r-- | article/index.html | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/article/index.html b/article/index.html index 47c3524..fd4cf41 100644 --- a/article/index.html +++ b/article/index.html @@ -12,11 +12,8 @@ <p>Pages for other projects (i.e. Evosaur) are not listed—only independent articles are listed here. These are sorted from newest to oldest. Some do not come with HTML anchors: these articles are not published online, but are still listed here. For these, you may ask me for a copy in real life, but it is within my rights to decline such requests. Note that if an article ID has an asterisk (*), it is considered fiction and its meaning shall not be interpreted literally.</p> <p><a href="/contact.html">Feel free to comment on any of the articles.</a></p> <ul> -<<<<<<< HEAD + <li><a href="sway-keysym.html">Sway keysym</a> (22)</li> <li><a href="affirmative-action.txt">Affirmative Action in Light of Harvard/UNC Case</a> (21)</li> -======= - <li><a href="sway-keysym.html">Sway keysym</a> (21)</li> ->>>>>>> fe23d62 (Sway keysym) <li><a href="hardware-oligopoly.html">Hardware Oligopolies and the Decentralization of Hardware Production</a> (20)</li> <li><a href="unicorn.html">Unicorn</a> (19*)</li> <li><a href="texmacs-maxima-integral.html">TeXmacs Maxima Integrals</a> (18)</li> |