diff options
author | Julien Duroure <julien.duroure@gmail.com> | 2021-11-06 12:07:40 +0300 |
---|---|---|
committer | Julien Duroure <julien.duroure@gmail.com> | 2021-11-06 12:07:40 +0300 |
commit | b3c179b2869d86c44a4b29e2c638ce2a596a820d (patch) | |
tree | a5836718a3c3dfc29fd86c7d33cace274c49c722 /io_scene_gltf2 | |
parent | 68360056f0fbd4093a497904b4c6755cc4ed02f3 (diff) |
glTF: fix bad merge
Diffstat (limited to 'io_scene_gltf2')
-rwxr-xr-x | io_scene_gltf2/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 8c738c41..9fdc2ac3 100755 --- a/io_scene_gltf2/__init__.py +++ b/io_scene_gltf2/__init__.py @@ -17,7 +17,6 @@ bl_info = { 'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors', "version": (1, 8, 1), 'blender': (3, 0, 0), ->>>>>>> blender-v3.0-release 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', 'warning': '', |