Commit 1f53ee8

committed

Fix merge conflict

1 parent d66afc7 commit 1f53ee8Copy full SHA for 1f53ee8

4 files changed

Assets
- Scenes
  - AttentionExperiment.unity.orig.meta
  - AttentionExperiment.unity
- Scripts
  - SessionManager.cs
  - Settings
    - InnerStimulusSettings.asset

Comments

(0)