Code

feat: conflict solved#57

Code

Open

yesimsit wants to merge 2 commits intomainReCoded-Org/cookiz-capstone-project:mainfrom i55-landing_meals_finalReCoded-Org/cookiz-capstone-project:i55-landing_meals_finalCopy head branch name to clipboard

+4-4

Commits

Commits on Aug 23, 2022

• feat: conflict solved

  yesimsit

  committed
  36958b8

Commits on Aug 24, 2022

• Merge branch 'main' into i55-landing_meals_final

  yesimsit

  authored
  d3472f7