diff options
author | 2019-05-02 11:21:13 -0700 | |
---|---|---|
committer | 2019-05-02 11:21:13 -0700 | |
commit | 4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c (patch) | |
tree | 723c529f1b7a24f86c606fa30479cd43708aedac /Docs/source/conf.py | |
parent | 5c8e911b1569d5015b2153fba05fbd2d798cc392 (diff) | |
parent | 341cd1b2af8ae96f261f7979c1dcf126f424cf60 (diff) | |
download | WarpX-4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c.tar.gz WarpX-4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c.tar.zst WarpX-4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c.zip |
fix conflicts
Diffstat (limited to 'Docs/source/conf.py')
-rw-r--r-- | Docs/source/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Docs/source/conf.py b/Docs/source/conf.py index d5165bd17..7604708f8 100644 --- a/Docs/source/conf.py +++ b/Docs/source/conf.py @@ -58,7 +58,7 @@ author = 'WarpX collaboration' # built documents. # # The short X.Y version. -version = '19.02' +version = '19.04' # The full version, including alpha/beta/rc tags. release = '' |