fixed unresolved conflict

AsoboStudio · Mar 18, 2022 · 3534f88 · 3534f88
1 parent f9053eb
commit 3534f88
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/addons/io_scene_gltf2_msfs/__init__.py b/addons/io_scene_gltf2_msfs/__init__.py
@@ -25,11 +25,7 @@
  "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"