# Conflicts: # Assets/Scripts/LevelEditor/WorldEditor.cs # Assets/Scripts/LevelEditor/WorldEditor.cs.meta
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cgd/gather-and-defend into origin/feature/Interface-Carte
Description
No description provided
Languages
C#
67.7%
ShaderLab
16.2%
GLSL
11.3%
HLSL
4.8%