merge

Author: mohanchen

source/module_esolver/lcao_after_scf.cpp

@@ -18,7 +18,6 @@ void ESolver_KS_LCAO<TK, TR>::after_scf(UnitCell& ucell, const int istep, const
     //------------------------------------------------------------------
     //! 2) output of lcao every few ionic steps 
     //------------------------------------------------------------------
-<<<<<<< HEAD
 	auto* estate = dynamic_cast<elecstate::ElecStateLCAO<TK>*>(this->pelec);
     auto* hamilt_lcao = dynamic_cast<hamilt::HamiltLCAO<TK, TR>*>(this->p_hamilt);