COMP350-Fall2022 / ArtemisFission

2 stars 0 forks source link

Employee Display UI #59

Closed Frances637 closed 2 years ago

Frances637 commented 2 years ago

On Monday, I did manage to make my code up and running; however, due to mix-ups with previous versions of the code, there is so many merge conflicts.

andrewcgraves commented 2 years ago

Resolved conflicts