Commit graph

4 commits

Author SHA1 Message Date
technillogue
a1f9597aa3 clean up diff 2021-04-25 19:19:39 -04:00
technillogue
b5fd2f920d hopefully fixed some stuff 2021-04-25 19:05:59 -04:00
technillogue
cc5bb13519 fix unmerged files 2021-04-24 22:37:59 -04:00
technillogue
685fce477c try to merge again 2021-04-24 22:23:52 -04:00