search

nlyra / SystemsEngineeringToolkit

1 stars 1 forks source link

168 log out #171

Closed collyntheshots closed 3 years ago

collyntheshots commented 3 years ago

I honestly dont know what happened and why there are so many deletions/additions, i def didnt do that much. I did change the tab to = 2 spaces on my end so maybe thats what it is

collyntheshots commented 3 years ago

Fixed merge conflicts merging to dev now