merge main into blender-v3.1-release

AsoboStudio · Mar 18, 2022 · f9053eb · f9053eb
1 parent 93b7f18
commit f9053eb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/addons/io_scene_gltf2_msfs/__init__.py b/addons/io_scene_gltf2_msfs/__init__.py
@@ -25,7 +25,11 @@
  "author": "Luca Pierabella, Wing42, pepperoni505, ronh991, tml1024, and others",
  "description": "This toolkit prepares your 3D assets to be used for Microsoft Flight Simulator",
  "blender": (3, 1, 0),
+<<<<<<< HEAD
  "version": (1, 1, 1),
+=======
+ "version": (1, 1, 2),
+>>>>>>> main
  "location": "File > Import-Export",
  "category": "Import-Export",
  "tracker_url": "https://github.com/AsoboStudio/glTF-Blender-IO-MSFS"