GitLab

Conflicts:
	fermi/fermie.F90
	global/constants.f90
	global/find_enpara.f90
	hybrid/exchange_val_hf.F90
	hybrid/hf_setup.F90
	hybrid/hsfock.F90
	hybrid/hyb_abcrot.F90
	hybrid/hybrid.F90
	hybrid/kp_perturbation.F90
	hybrid/read_core.F90
	hybrid/subvxc.F90
	hybrid/symm_hf.F90
	hybrid/symmetrizeh.F90
	hybrid/trafo.F90
	hybrid/wavefproducts.F90
	init/CMakeLists.txt
	init/old_inp/fleur_init_old.F90
	init/postprocessInput.F90
	io/r_inpXML.F90
	io/w_inpXML.f90
	io/xml/FleurInputSchema.xsd
	io/xmlIntWrapFort.f90
	kpoints/kptmop.f
	main/cdngen.F90
	main/fleur.F90
	main/fleur_init.F90
	mix/type_mixvector.F90
	types/types_enpara.F90
	types/types_gradients.f90
	types/types_kpts.f90
	types/types_setup.F90
	types/types_xcpot_inbuild.F90
	types/types_xcpot_libxc.F90
	vgen/vgen_xcpot.F90
	vgen/vis_xc.F90
	vgen/vmt_xc.F90