From b3c179b2869d86c44a4b29e2c638ce2a596a820d Mon Sep 17 00:00:00 2001
From: Julien Duroure <julien.duroure@gmail.com>
Date: Sat, 6 Nov 2021 10:07:40 +0100
Subject: [PATCH] glTF: fix bad merge
---
io_scene_gltf2/__init__.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 8c738c41c..9fdc2ac33 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': '',
--
GitLab