commit 6bfde1268002c4a3d3dd6c203edb3399339aaeae
from: Thomas Adam <thomas@xteddy.org>
date: Wed Sep 29 08:55:40 2021 UTC

portable: fix READMEs

Remove conflict markers in README, and add mailing-list link to both
READMEs.

Noticed by stsp

commit - 2a00e21c0c6aadccf2d86abbeaa0252c54ae87db
commit + 6bfde1268002c4a3d3dd6c203edb3399339aaeae
blob - cd81580376ffae0cd27ef67ab5dad9b62bbfd2de
blob + fc411c4bf2b9ee86c045040ecf4e8332ba97cc2d
--- .github/README.md
+++ .github/README.md
@@ -78,3 +78,4 @@ Thomas Adam <thomas@xteddy.org>
 thomas_adam (#gameoftrees on irc.libera.chat)
 
 [1]  https://gameoftrees.org
+[2]  https://lists.openbsd.org/cgi-bin/mj_wwwusr?user=&passw=&func=lists-long-full&extra=gameoftrees
blob - 7f071e47983e5c16b505d43745c22c538d3f4f65
blob + 5163aba29f9c7af4d4c4b29641d5b4c0ddaba03d
--- README.portable
+++ README.portable
@@ -39,7 +39,6 @@ NOTE:  THIS ONLY WORKS AFTER `make install` DUE TO HOW
 INSTALLATION
 ============
 
-<<<<<<< HEAD
 ```
  $ ./autogen.sh
  $ ./configure && make
@@ -59,11 +58,6 @@ sent to the mailing list for review [2] or sent to me 
 
 The read-only Github repository also runs CI checks using Cirrus-CI on Linux
 and FreeBSD.
-=======
- $ autoreconf -i
- $ ./configure && make
- $ sudo make install
->>>>>>> 74564ec3 (portable: initial Linux compilation)
 
 TODO
 ====
@@ -81,3 +75,4 @@ Thomas Adam <thomas@xteddy.org>
 thomas_adam (#gameoftrees on irc.libera.chat)
 
 [1]  https://gameoftrees.org
+[2]  https://lists.openbsd.org/cgi-bin/mj_wwwusr?user=&passw=&func=lists-long-full&extra=gameoftrees