merging develop into hamil_getters

JonathanKipp · Nov 17, 2021 · f1e1e9d · f1e1e9d
1 parent ace145b
commit f1e1e9d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/core/src/Spirit/Hamiltonian.cpp b/core/src/Spirit/Hamiltonian.cpp
@@ -442,11 +442,7 @@ try
         *n_shells = ham->exchange_shell_magnitudes.size();
 
         // Note the array needs to be correctly allocated beforehand!
-<<<<<<< HEAD
-        if(jij != nullptr)
-=======
         for( std::size_t i = 0; i < ham->exchange_shell_magnitudes.size(); ++i )
->>>>>>> develop
         {
             for( int i = 0; i < ham->exchange_shell_magnitudes.size(); ++i )
             {