Fixed merge conflicts, Nils, Lukas, Stina, Malin, Alma, Arvid
authorlukel495 <lukel495@su15-111.ad.liu.se>
Wed, 15 Nov 2023 13:52:33 +0000 (14:52 +0100)
committerlukel495 <lukel495@su15-111.ad.liu.se>
Wed, 15 Nov 2023 13:52:33 +0000 (14:52 +0100)
commit360a71478d78238f7c730ba1d182dde7a4e46399
tree7e068268ca554b21637e204870748be1f3fa2530
parentdded46b176dd4bfdb66c26cfe130a7f99463c92b
parentcddf98826938051582a5570a1da239b334a3cffa
Fixed merge conflicts, Nils, Lukas, Stina, Malin, Alma, Arvid
src/States.cc
src/States.h