Merge branch 'release' into dev

# Conflicts: # openpnm/__version__.py # setup.cfg
PMEAL · Jan 26, 2024 · cc3012b · cc3012b
2 parents 1668355 + 9f20159
commit cc3012b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/openpnm/__version__.py b/openpnm/__version__.py
@@ -1 +1 @@
-__version__ = '3.3.0.dev9'
+__version__ = '3.4.0.dev0'
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.3.0.dev9
+current_version = 3.4.0.dev0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.(?P<release>\D+)(?P<build>\d+)?
 serialize = {major}.{minor}.{patch}.{release}{build}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '3.3.0.dev9'
		__version__ = '3.4.0.dev0'