Resolving conflict

Libensemble · Apr 15, 2020 · 6cd7181 · 6cd7181
1 parent 80a3c10
commit 6cd7181
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.flake8 b/.flake8
@@ -39,3 +39,4 @@ per-file-ignores =
         libensemble/tests/scaling_tests/warpx/run_libE_on_warpX_aposmm.py:E402
         libensemble/gen_funcs/persistent_aposmm.py:E402, E501
         libensemble/tests/regression_tests/test_persistent_aposmm*:E402
+        libensemble/tests/regression_tests/test_aposmm*:E402