Updating to release 3.2.0

1 files changed, 0 insertions, 24 deletions

diff --git a/min-max-conflict.patch b/min-max-conflict.patch
deleted file mode 100644
index e5e3f4259fd4..000000000000
--- a/min-max-conflict.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: SRC/system_of_eqn/linearSOE/sparseGEN/DistributedSuperLU.cpp
-===================================================================
---- SRC/system_of_eqn/linearSOE/sparseGEN/DistributedSuperLU.cpp	(revision 6236)
-+++ SRC/system_of_eqn/linearSOE/sparseGEN/DistributedSuperLU.cpp	(working copy)
-@@ -31,6 +31,7 @@
- 
- #include <DistributedSuperLU.h>
- #include <SparseGenColLinSOE.h>
-+#include <superlu_ddefs.h>
- #include <f2c.h>
- #include <math.h>
- #include <Channel.h>
-@@ -37,10 +38,10 @@
- #include <FEM_ObjectBroker.h>
- #include <ID.h>
- 
--#include <superlu_ddefs.h>
- 
- 
- 
-+
- superlu_options_t options;
- SuperLUStat_t stat;
- SuperMatrix A;