Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history 
Merge branch 'main' of github.com:Openscapes/approach-guide

# Conflicts:
#	mentors-framework/onboarding.qmd
  • Loading branch information
@jules32
jules32 committed Oct 2, 2023
2 parents 6dd743c + bf5d2d4 commit 0649e70
Show file tree
Hide file tree
Showing 2 changed files with 214 additions and 391 deletions.
Loading

0 comments on commit 0649e70

Please sign in to comment.