Skip to content

Commit

Permalink
Merge branch 'master' of github.com:lbl-camera/fvGP
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcusMNoack committed Feb 18, 2022
2 parents f99be38 + 17b27fe commit 21dfe99
Show file tree
Hide file tree
Showing 4 changed files with 2,386 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fvGP-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
push:
branches: [ master ]
tags:
- '[0-9]+.[0-9]+.[0-9]'
- '[0-9]+.[0-9]+.[0-9]+'
pull_request:
branches: [ master ]

Expand Down
1 change: 0 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
'sphinx_panels',
'sphinx.ext.autodoc',
'sphinx.ext.napoleon'
'nbsphinx'
]

# MyST extensions
Expand Down

0 comments on commit 21dfe99

Please sign in to comment.