Fix conflict

[xonotic/xonotic-maps.pk3dir.git] / textures / map_geoplanetary / wiz1_4_mesh.jpg

diff --git a/textures/map_geoplanetary/wiz1_4_mesh.jpg b/textures/map_geoplanetary/wiz1_4_mesh.jpg
new file mode 100644 (file)
index 0000000..617a252
Binary files /dev/null and b/textures/map_geoplanetary/wiz1_4_mesh.jpg differ