Skip to content
Snippets Groups Projects
Commit e5d81aa5 authored by Jialei Ding's avatar Jialei Ding
Browse files

Merge branch 'release' into 'main' 

# Conflicts:
#   synced_files/GA_1_7/Solution/Discharge/Analysis_discharge_solution.ipynb
#   synced_files/GA_1_7/Solution/Emissions/Analysis_emissions_solution.ipynb
#   synced_files/GA_1_7/Solution/Force/Analysis_force_solution.ipynb
#   synced_files/GA_1_7/Student/Discharge/Analysis_discharge.ipynb
#   synced_files/GA_1_7/Student/Emissions/Analysis_emissions.ipynb
#   synced_files/GA_1_7/Student/Force/Analysis_force.ipynb
#   synced_files/GA_1_7/Unused/Temp/Distribution_Fitting_T.ipynb
#   synced_files/Week_2_2/old/PA_2_1_solution_sympy.ipynb
#   synced_files/Week_2_2/old/old_PA10_solution_sympy.ipynb
#   synced_files/Week_2_7/WS_2_7_solution.ipynb
#   synced_files/Week_2_7/WS_2_7_student.ipynb
parents 5667dc03 a59b7098
No related branches found
No related tags found
3 merge requests!47Update_Daniel_branch,!42Main,!35Release
Pipeline #262776 passed
Stage: setup
Stage: sync
Stage: update_repo
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 456 additions and 67 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment