Attempt to fix conflicts

As some commits from yesterday and this morning caused conflicts with
commits I made last week I'm trying to fix it on the branch that I
believe introduced the changes. If this does not work I do not know what
I'll do but it have to be done another time.
This commit is contained in:
Cody Boone Ferguson committed 2023-02-22 07:29:22 -08:00
1 parent aac3522e25
commit 0e9136f9fb
27 files changed
+363 -316

No files matched your search

+1
View File
@@ -2,3 +2,4 @@ prog-simple
prog.orig
weasel
weasel-simple
prog