Fix install lbmpy without VCS
1 unresolved thread
1 unresolved thread
+ 9
− 1
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -4,6 +4,7 @@ from setuptools import setup, find_packages
@@ -79,6 +80,13 @@ def get_cmdclass():
@@ -89,7 +97,7 @@ setup(name='lbmpy',