# Conflicts: # source/blender/blenkernel/BKE_blender_version.h # source/blender/blenloader/intern/versioning_userdef.cc