Code

fix: sub module conflict error#295

Code

Merged

cocolato merged 5 commits intoThriftpy:masterThriftpy/thriftpy2:masterfrom StellarisW:fix/sub_moduleStellarisW/thriftpy2:fix/sub_moduleCopy head branch name to clipboardJan 14, 2025

+66-13

Commits

Commits on Nov 29, 2024

• fix: sub module conflict error

  StellarisW

  committed
  08b5ac6

  Copy full SHA for 08b5ac6

Commits on Jan 2, 2025

• fix: sub module conflict error

  StellarisW

  committed
  56a9d07

  Copy full SHA for 56a9d07

• Merge remote-tracking branch 'origin/fix/sub_module' into fix/sub_module

  StellarisW

  committed
  08a290d

  Copy full SHA for 08a290d

Commits on Jan 8, 2025

• fix: sub module conflict error

  StellarisW

  committed
  431ab63

  Copy full SHA for 431ab63

Commits on Jan 13, 2025

• fix: sub module conflict error

  StellarisW

  committed
  6d7b91a

  Copy full SHA for 6d7b91a