Attempting to fix merge conflicts through github

ChicoState / ODIT

4 stars 4 forks source link

Open CodeMastr3 opened 4 years ago

CodeMastr3 commented 4 years ago

We are choosing to leave this up until we figure out why Google only sometimes let's you choose a username