[Bf-extensions-cvs] [f12430ca] master: Collection Manager: Fix git issue. Task: T69577

[Ryan Inch]

Commit: f12430cae606db8aeeb72f99fe15ebbd71d4a92c
Author: Ryan Inch
Date:   Sat Apr 18 22:57:17 2020 -0400
Branches: master
https://developer.blender.org/rBAf12430cae606db8aeeb72f99fe15ebbd71d4a92c

Collection Manager: Fix git issue. Task: T69577

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

M	object_collection_manager/__init__.py

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

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index b4807ad7..943e5b0f 100644
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@ -23,10 +23,7 @@ bl_info = {
     "description": "Manage collections and their objects",
     "author": "Ryan Inch",
     "version": (2,7,11),
-<<<<<<< HEAD
-=======
     "blender": (2, 80, 0),
->>>>>>> blender-v2.83-release
     "location": "View3D - Object Mode (Shortcut - M)",
     "warning": '',  # used for warning icon and text in addons panel
     "doc_url": "{BLENDER_MANUAL_URL}/addons/interface/collection_manager.html",