search

COMP350-Fall2022 / ArtemisFission

2 stars 0 forks source link

Sprint2demo #70

Closed jalexcrawford closed 1 year ago

jalexcrawford commented 1 year ago

Pull all features in the sprint 2 demo into dev

andrewcgraves commented 1 year ago

@jalexcrawford did u mean to merge this branch? There are a few conflicts and like +66 file changes

andrewcgraves commented 1 year ago

All the sprint 2 demo things are already in dev

jalexcrawford commented 1 year ago

Ah I saw that EmployeeDisplayUI.cs was the default script from unity and just did a blind pull request. I'll close this request.