Fix leftover from merges
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