From 6cd7181b627d5a7d37c075aa7a3b8461a5633fcf Mon Sep 17 00:00:00 2001
From: Jeffrey Larson <jmlarson@anl.gov>
Date: Wed, 15 Apr 2020 15:44:55 -0500
Subject: [PATCH] Resolving conflict

---
 .flake8 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.flake8 b/.flake8
index 42816293a..788d5b58f 100644
--- 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