From 3534f885941701165d7bffd59b96eeb227be2c8d Mon Sep 17 00:00:00 2001
From: lpierabella <77288191+lpierabella@users.noreply.github.com>
Date: Fri, 18 Mar 2022 10:13:58 +0100
Subject: [PATCH] fixed unresolved conflict

---
 addons/io_scene_gltf2_msfs/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/io_scene_gltf2_msfs/__init__.py b/addons/io_scene_gltf2_msfs/__init__.py
index c898ae0..2790de9 100644
--- 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"