# Conflicts: # .gitignore # debug/bin/fmPos.ini # fmPos.pro # fmp_epay/fmp_epay.cpp # fmp_epay/fmp_epay.pro # fmp_epay/fmp_epay_p.cpp # fmp_epay/fmp_pe_handlers.cpp # fmp_epay/fmp_pe_handlers.h # fmp_epay/version.h # fmp_home/fmp_he_handlers.cpp # fmp_home/fmp_home_p.cpp # fmp_settings/fmp_settings_def.h # fmp_settings/version.h # fmp_syncer/version.h
