search

CSC207-2023Y-UofT / course-project-tnt

course-project-tnt created by GitHub Classroom
1 stars 0 forks source link

2 timer #20

Closed yoyo-gong closed 1 year ago

yoyo-gong commented 1 year ago

Finished basic functions of the timer; Updated the background color; Organized the packages into the correct location.

peterjangml commented 1 year ago

Hey Yoyo, There seems to be conflicts with certain files. Please either execute git pull or re-clone the main branch so that there no file conflicts. Also, please try not to push local.properties (tip: https://stackoverflow.com/questions/39791995/the-files-ds-store-and-ds-store-had-a-tree-conflict-error-from-git-in-xcode-8)