[Bf-extensions-cvs] [b3c179b2] master: glTF: fix bad merge

[Julien Duroure]

Commit: b3c179b2869d86c44a4b29e2c638ce2a596a820d
Author: Julien Duroure
Date:   Sat Nov 6 10:07:40 2021 +0100
Branches: master
https://developer.blender.org/rBAb3c179b2869d86c44a4b29e2c638ce2a596a820d

glTF: fix bad merge

===================================================================

M	io_scene_gltf2/__init__.py

===================================================================

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': '',