Skip to content

Commit

Permalink
rebase main, resolve conflict and comments
Browse files Browse the repository at this point in the history
  • Loading branch information
wcy-fdu committed Sep 21, 2023
2 parents 66ccd89 + f075a6b commit 441fd9a
Show file tree
Hide file tree
Showing 308 changed files with 8,745 additions and 4,949 deletions.
2 changes: 2 additions & 0 deletions .config/hakari.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ platforms = [
# Write out exact versions rather than a semver range. (Defaults to false.)
# exact-versions = true

unify-target-host = "unify-if-both"

[traversal-excludes]
workspace-members = [
"workspace-config",
Expand Down
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ risedev-components.user.env
riselab-components.user.env

.git/

Dockerfile
.dockerignore
3 changes: 2 additions & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ header:

paths:
- "src/**/*.rs"
- "src/**/*.py"
- "src/**/*.html"
- "dashboard/**/*.js"
- "dashboard/**/*.ts"
- "src/**/*.html"
- "java/**/*.java"
- "java/**/*.py"

Expand Down
Loading

0 comments on commit 441fd9a

Please sign in to comment.