search

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

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

new test class created #36

Closed kimmari1 closed 1 year ago

kimmari1 commented 1 year ago
kimmari1 commented 1 year ago

Yes, we can create removeUser! I'm not sure how this would look like in the app, as we don't have any way for the user to delete accounts but it can still be added in.

For RegisterUser and SigninUser, the conflict comes from me adding in lines when another commit worked on those same lines. I thought I resolved the conflict by shifting down the code from PR#31 by a couple lines, but if there are still conflicts, I can try to take a look again. The only change I made was setting the variable getUsername to the getter method created in DatabaseHelper.

kimmari1 commented 1 year ago

My bad, just resolved the conflicts and committed my changes. The code should be good to merge now.