Fixed merge error
authorlukel495 <lukel495@su15-111.ad.liu.se>
Wed, 15 Nov 2023 13:43:47 +0000 (14:43 +0100)
committerlukel495 <lukel495@su15-111.ad.liu.se>
Wed, 15 Nov 2023 13:43:47 +0000 (14:43 +0100)
commitdded46b176dd4bfdb66c26cfe130a7f99463c92b
tree483d23a36e7d08d3b15d7fed7799e5856a2806ff
parentd1edb61e2efe04f9ab3d32b81170c98f51a71b59
Fixed merge error
src/States.cc