aac996d671
Committing changes that aren't mine but Git is saying they're mine (Events for footsteps). Shouldn't mess anything up.
9 lines
260 B (Stored with Git LFS)
Plaintext
9 lines
260 B (Stored with Git LFS)
Plaintext
version https://git-lfs.github.com/spec/v1
|
|
<<<<<<< HEAD
|
|
oid sha256:9e8db40e0373b4f8a4e7b012d03ba801c6c0bde37924d9ac9a1ba0d561173a39
|
|
size 16953
|
|
=======
|
|
oid sha256:ae605e6ccce7780bfcb8fd2543db00c3f0e9ff30e3982d7318fabce11cd17ad6
|
|
size 16147
|
|
>>>>>>> origin/Shiori
|