]> git.cameronkatri.com Git - gmtk-gamejam.git/commit
Resolve conflicts
authorCarson Katri <carson.katri@gmail.com>
Sat, 12 Jun 2021 20:57:05 +0000 (16:57 -0400)
committerCarson Katri <carson.katri@gmail.com>
Sat, 12 Jun 2021 20:57:05 +0000 (16:57 -0400)
commit2da4072647dbf8577f8a5e2391551fbbfceef231
tree636de5585864d64832d362117d40c93de97e5bb9
parent939170f625e5928d5ca86a57796aaa23f25a4fa7
parentd6d5014337ab72a6eb8c2f93fae107c71d267649
Resolve conflicts
Assets/Scripts/Controllers/AIController.cs
Assets/Scripts/Controllers/GameController.cs