Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
balajialg committed Jan 17, 2025
1 parent 8e2d712 commit 704a0ed
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion deployments/r/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jupyterhub:
mem_limit: 2048M
mem_guarantee: 2048M

# PS 191, Spring 25, https://github.com/berkeley-dsep-infra/datahub/issues/6593
# PolSci 191, Spring 2025, https://github.com/berkeley-dsep-infra/datahub/issues/6593
course::1541486:
mem_limit: 6144M
mem_guarantee: 6144M
Expand Down

0 comments on commit 704a0ed

Please sign in to comment.