Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

author stian853 <stian853@tlvm-4-2-3.ad.liu.se>

Mon, 13 Nov 2023 07:30:55 +0000 (08:30 +0100)

committer stian853 <stian853@tlvm-4-2-3.ad.liu.se>

Mon, 13 Nov 2023 07:30:55 +0000 (08:30 +0100)
author stian853 <stian853@tlvm-4-2-3.ad.liu.se>
Mon, 13 Nov 2023 07:30:55 +0000 (08:30 +0100)
committer stian853 <stian853@tlvm-4-2-3.ad.liu.se>
Mon, 13 Nov 2023 07:30:55 +0000 (08:30 +0100)
diff --cc src/States.h
Simple merge
diff --cc src/_main.cc
Simple merge
author	stian853 <stian853@tlvm-4-2-3.ad.liu.se>
	Mon, 13 Nov 2023 07:30:55 +0000 (08:30 +0100)
committer	stian853 <stian853@tlvm-4-2-3.ad.liu.se>
	Mon, 13 Nov 2023 07:30:55 +0000 (08:30 +0100)
		1	2
src/States.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history