spoerrireto
/
UP-Viagg-io
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
UP-Viagg-io/Viagg-io/Assets/Resources/BuildDateTime.txt

10 lines
164 B
Plaintext
Raw Normal View History

Merge branch 'leveldesign' # Conflicts: # Viagg-io/Assets/Resources/BuildDateTime.txt # Viagg-io/ProjectSettings/EditorBuildSettings.asset
2025-01-31 14:16:12 +01:00
<<<<<<< HEAD
Merge branch 'master' into programming # Conflicts: # Viagg-io/Assets/Resources/BuildDateTime.txt # Viagg-io/ProjectSettings/EditorBuildSettings.asset
2025-01-31 14:27:26 +01:00
2025-01-28T16:43:12.0269790Z
=======
<<<<<<< HEAD
Merge branch 'leveldesign' # Conflicts: # Viagg-io/Assets/Resources/BuildDateTime.txt # Viagg-io/ProjectSettings/EditorBuildSettings.asset
2025-01-31 14:16:12 +01:00
2025-01-17T14:37:10.9376140Z
=======
2025-01-28T09:20:11.7363448Z
>>>>>>> leveldesign
Merge branch 'master' into programming # Conflicts: # Viagg-io/Assets/Resources/BuildDateTime.txt # Viagg-io/ProjectSettings/EditorBuildSettings.asset
2025-01-31 14:27:26 +01:00
>>>>>>> master