git.txt

heads/main
On branch main
Your branch and 'origin/main' have diverged,
and have 1 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:
	modified:   cfg/main.dms
	modified:   cfg/main/SourceData/OSM.dms
	modified:   cfg/main/SourceData/RegioIndelingen.dms
	modified:   git.txt

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   cfg/main.dms
<<<<<<< HEAD
	modified:   cfg/main/SourceData/OSM.dms
	modified:   cfg/main/SourceData/RegioIndelingen.dms
	modified:   git.txt

9950662a21f30953d9ef9d57fc470fdb1f45464a
=======
	modified:   cfg/main/ModelParameters_base.dms
	modified:   cfg/main/NetworkSetup.dms
	modified:   cfg/main/SourceData/BAG.dms
	modified:   cfg/main/Templates/Merge_Regions_Car_T.dms
	modified:   git.txt

no changes added to commit (use "git add" and/or "git commit -a")
9e49cb3f7cb4608db0fb10fcbdc922e5a9d99167
>>>>>>> da73a26acbdb1d91eeea596c70aa39f8432a4bd4
908d94075b759a1a2c9068259767b3e91d673a93	refs/tags/calc_sept2023
c18a581519f54ed79143bc355733ea0fe3055165	refs/tags/calc_sept2024
e9ccd3c3cd8e6478d3b1e52cf151360abaa6d459	refs/tags/last_v2024