Fixed merge conflicts

GameLabGraz · Nov 18, 2024 · b251fb6 · b251fb6
1 parent abd7eab
commit b251fb6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/unity/Assets/Maroon/reusableGui/Experiment/Scripts/Runtime/LocalizedSimpleTooltip.cs.meta b/unity/Assets/Maroon/reusableGui/Experiment/Scripts/Runtime/LocalizedSimpleTooltip.cs.meta
diff --git a/unity/Assets/Maroon/reusablePrefabs/ConfigLoader.meta b/unity/Assets/Maroon/reusablePrefabs/ConfigLoader.meta
diff --git a/unity/Assets/Maroon/reusableScripts/ExperimentParameters/ExperimentParameters.cs.meta b/unity/Assets/Maroon/reusableScripts/ExperimentParameters/ExperimentParameters.cs.meta