Closed jaseknighter closed 2 years ago
nice!!! I had a look at the conflicts - they are due to the code I recently updated. feel free to nuke all of the conflicts and use your version of the file instead of the current version (that I pushed). there is only one line that will need to be added back (prereqs.install()
), but I can do that later.
thanks! I think I was able to keep the call to prereqs.install
. I'll merge into main after I take a look at what I just did. this is my first time dealing with branch conflicts in GitHub! last time I did this soft of thing was about 20 years ago in CVS. :P
closing as additional changes are needed