slimecing

commit 0f775bd23a9153f193e53ef0c2b7518fd1c9d006
parent 643cff20d6c44ee4637a5657be9e46a9ff6e335f
Author: PlutoTank <qwolkensperg@gmail.com>
Date:   Tue, 14 Apr 2020 16:18:51 -0400

oof

Diffstat:
M
ProjectSettings/ProjectVersion.txt
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,7 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 m_EditorVersion: 2019.3.0f6
 m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)
 =======
 m_EditorVersion: 2019.3.7f1
 m_EditorVersionWithRevision: 2019.3.7f1 (6437fd74d35d)
 >>>>>>> Added triggers and lots of backend
+=======
+m_EditorVersion: 2019.3.9f1
+m_EditorVersionWithRevision: 2019.3.9f1 (e6e740a1c473)
+>>>>>>> oof