Skip to content

Fix leftover from merges

Yvonne Kothmeier requested to merge fix_merge into dev

Resolves merge conflicts in the dev-branch.

Deleted files: res://assets/models/wavy_water/water.shader and res://assets/models/still_water/water.shader
File already exists at res://assets/shaders/water.shader

Signed-off-by: florian floriankothmeier@web.de

Merge request reports