altanborali16 / SWE574-Group2

3 stars 0 forks source link

Clean up branches, fix conflicts and upstream errors #81

Closed efestrikesback closed 4 hours ago

efestrikesback commented 4 hours ago

Fixed upstream errors, and removed conflicts. Deleted previous branches that are not eligible to merge. Secured the code base, and saved the work both on the repo and local machine.

efestrikesback commented 4 hours ago

Fixed upstream errors, and removed conflicts. Deleted previous branches that are not eligible to merge. Secured the code base, and saved the work both on the repo and local machine.