search

batterydied / Aquatica

0 stars 1 forks source link

Merge main2 into main to Resolve Merge Conflicts Between main and bensonMain #98

Closed batterydied closed 1 day ago

batterydied commented 3 days ago

This pull request resolves the merge conflicts between main and bensonMain by merging the manually resolved branch main2 into main. The main2 branch was created to ensure all necessary changes from both main and bensonMain are retained, while maintaining a consistent and functional codebase.

batterydied commented 2 days ago

oops forgot the issue tag format:

90 #99 #104 #105 #106 #107

HaiyiCai commented 2 days ago

Hi Benson, thank you for helping around and updating the backend files! I saw your regarding changes on navigation menu style & logo. The new looks good with little icon there.

Please show me how the responsive menu works with new logo on your end before merging, so that I can modify on what I did (especially for smaller screen).

Thank you!