From 11bb36ac8ce790f32a9a3e5d2131ee12820fb8ec Mon Sep 17 00:00:00 2001
From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com>
Date: Wed, 22 Feb 2023 05:44:55 -0800
Subject: [PATCH] Fix conflicts with recent commits (I think/hope)

Some commits this week caused some conflicts with some open pull
requests made last week. I believe and hope that I fixed the conflicts.
---
 1984/{README => README.md} | 0
 1985/{README => README.md} | 0
 1986/{README => README.md} | 0
 1987/{README => README.md} | 0
 1988/{README => README.md} | 0
 1988/{rules => rules.txt}  | 0
 1989/{README => README.md} | 0
 1990/{README => README.md} | 0
 1990/{rules => rules.txt}  | 0
 1991/{README => README.md} | 0
 1992/{README => README.md} | 0
 1993/{README => README.md} | 0
 1994/{README => README.md} | 0
 1995/{README => README.md} | 0
 1996/{README => README.md} | 0
 1998/{README => README.md} | 0
 2000/{README => README.md} | 0
 2001/{README => README.md} | 0
 2004/{README => README.md} | 0
 2018/ferguson/.gitignore   | 2 +-
 all/{README => README.md}  | 0
 21 files changed, 1 insertion(+), 1 deletion(-)
 rename 1984/{README => README.md} (100%)
 rename 1985/{README => README.md} (100%)
 rename 1986/{README => README.md} (100%)
 rename 1987/{README => README.md} (100%)
 rename 1988/{README => README.md} (100%)
 rename 1988/{rules => rules.txt} (100%)
 rename 1989/{README => README.md} (100%)
 rename 1990/{README => README.md} (100%)
 rename 1990/{rules => rules.txt} (100%)
 rename 1991/{README => README.md} (100%)
 rename 1992/{README => README.md} (100%)
 rename 1993/{README => README.md} (100%)
 rename 1994/{README => README.md} (100%)
 rename 1995/{README => README.md} (100%)
 rename 1996/{README => README.md} (100%)
 rename 1998/{README => README.md} (100%)
 rename 2000/{README => README.md} (100%)
 rename 2001/{README => README.md} (100%)
 rename 2004/{README => README.md} (100%)
 rename all/{README => README.md} (100%)

diff --git a/1984/README b/1984/README.md
similarity index 100%
rename from 1984/README
rename to 1984/README.md
diff --git a/1985/README b/1985/README.md
similarity index 100%
rename from 1985/README
rename to 1985/README.md
diff --git a/1986/README b/1986/README.md
similarity index 100%
rename from 1986/README
rename to 1986/README.md
diff --git a/1987/README b/1987/README.md
similarity index 100%
rename from 1987/README
rename to 1987/README.md
diff --git a/1988/README b/1988/README.md
similarity index 100%
rename from 1988/README
rename to 1988/README.md
diff --git a/1988/rules b/1988/rules.txt
similarity index 100%
rename from 1988/rules
rename to 1988/rules.txt
diff --git a/1989/README b/1989/README.md
similarity index 100%
rename from 1989/README
rename to 1989/README.md
diff --git a/1990/README b/1990/README.md
similarity index 100%
rename from 1990/README
rename to 1990/README.md
diff --git a/1990/rules b/1990/rules.txt
similarity index 100%
rename from 1990/rules
rename to 1990/rules.txt
diff --git a/1991/README b/1991/README.md
similarity index 100%
rename from 1991/README
rename to 1991/README.md
diff --git a/1992/README b/1992/README.md
similarity index 100%
rename from 1992/README
rename to 1992/README.md
diff --git a/1993/README b/1993/README.md
similarity index 100%
rename from 1993/README
rename to 1993/README.md
diff --git a/1994/README b/1994/README.md
similarity index 100%
rename from 1994/README
rename to 1994/README.md
diff --git a/1995/README b/1995/README.md
similarity index 100%
rename from 1995/README
rename to 1995/README.md
diff --git a/1996/README b/1996/README.md
similarity index 100%
rename from 1996/README
rename to 1996/README.md
diff --git a/1998/README b/1998/README.md
similarity index 100%
rename from 1998/README
rename to 1998/README.md
diff --git a/2000/README b/2000/README.md
similarity index 100%
rename from 2000/README
rename to 2000/README.md
diff --git a/2001/README b/2001/README.md
similarity index 100%
rename from 2001/README
rename to 2001/README.md
diff --git a/2004/README b/2004/README.md
similarity index 100%
rename from 2004/README
rename to 2004/README.md
diff --git a/2018/ferguson/.gitignore b/2018/ferguson/.gitignore
index 657860f36..e626c23cc 100644
--- a/2018/ferguson/.gitignore
+++ b/2018/ferguson/.gitignore
@@ -1,5 +1,5 @@
-prog
 prog-simple
 prog.orig
 weasel
 weasel-simple
+prog
diff --git a/all/README b/all/README.md
similarity index 100%
rename from all/README
rename to all/README.md