Code

solved some buggy problems on my end#276

Code

Closed

NgLixuanNixon wants to merge 14 commits intoAY2324S1-CS2113-W12-4:masterAY2324S1-CS2113-W12-4/tp:masterfrom NgLixuanNixon:masterNgLixuanNixon/tp:masterCopy head branch name to clipboard

+24-10

Commits

Commits on Nov 6, 2023

• calorienbalance done

  NgLixuanNixon

  committed
  844bfdb

  Copy full SHA for 844bfdb

• solving merge conflict

  NgLixuanNixon

  committed
  a77107a

  Copy full SHA for a77107a

• Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp into Calories_Balance

  Show description for a2875aa
  NgLixuanNixon

  committed
  a2875aa

  Copy full SHA for a2875aa

• no message

  NgLixuanNixon

  committed
  15ca5da

  Copy full SHA for 15ca5da

• fix some bugs for caloriebalance

  NgLixuanNixon

  committed
  5bd7f9a

  Copy full SHA for 5bd7f9a

• addedUg for caloriebalance

  NgLixuanNixon

  committed
  5b4861a

  Copy full SHA for 5b4861a

Commits on Nov 13, 2023

• Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp

  Show description for 05463f7
  NgLixuanNixon

  committed
  05463f7

  Copy full SHA for 05463f7

• no message

  NgLixuanNixon

  committed
  de104f5

  Copy full SHA for de104f5

• no message

  NgLixuanNixon

  committed
  e28074e

  Copy full SHA for e28074e

• no message

  NgLixuanNixon

  committed
  1e29e1b

  Copy full SHA for 1e29e1b

• Merge branch 'master' into master

  NgLixuanNixon

  authored
  f32974c

  Copy full SHA for f32974c

• Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp

  Show description for e2a3aa0
  NgLixuanNixon

  committed
  e2a3aa0

  Copy full SHA for e2a3aa0

• Merge branch 'master' of https://github.com/NgLixuanNixon/tp

  Show description for 696336c
  NgLixuanNixon

  committed
  696336c

  Copy full SHA for 696336c

• checkstyle

  NgLixuanNixon

  committed
  f385353

  Copy full SHA for f385353