Fix conflicts with recent commits (I think/hope)

Browse Source

Some commits this week caused some conflicts with some open pull
requests made last week. I believe and hope that I fixed the conflicts.

...

This commit is contained in:

Cody Boone Ferguson committed 2023-02-22 05:44:55 -08:00

1 parent 79c7f3d1a0

commit 11bb36ac8c

21 files changed

+1 -1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

1990/README → 1990/README.md

File renamed without changes.

1990/rules → 1990/rules.txt

File renamed without changes.