Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenzl25
chenzl25 committed Nov 13, 2024
2 parents fda1ab3 + c0b5e64 commit 367e16f
Show file tree
Hide file tree
Showing 248 changed files with 7,465 additions and 6,966 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ c583e2c6c054764249acf484438c7bf7197765f4

# chore: replace all ProstXxx with PbXxx (#8621)
6fd8821f2e053957b183d648bea9c95b6703941f

# chore: cleanup v2 naming for sql metastore (#18941)
9a6a7f9052d5679165ff57cc01417c742c95351c
Loading

0 comments on commit 367e16f

Please sign in to comment.