[Bf-extensions-cvs] [926d8beb] master: Collection Manager: Expander fixes. Task: T69577

[Ryan Inch]

Commit: 926d8beb555d9e1308c544a3d7b525a74c1261a5
Author: Ryan Inch
Date:   Fri Apr 17 04:20:13 2020 -0400
Branches: master
https://developer.blender.org/rBA926d8beb555d9e1308c544a3d7b525a74c1261a5

Collection Manager: Expander fixes. Task: T69577

Fix expanded not getting properly updated on collection name change.
Fix expand history not getting updated on collection name change.
Fix expand history not getting cleared on collapse all.
Fix isolate tree restoring no matter what expander you click on.
Fix UI not showing isolated status when expander not expanded.

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

M	object_collection_manager/__init__.py

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

diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index 943e5b0f..dde8aebe 100644
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@ -22,7 +22,11 @@ bl_info = {
     "name": "Collection Manager",
     "description": "Manage collections and their objects",
     "author": "Ryan Inch",
+<<<<<<< HEAD
     "version": (2,7,11),
+=======
+    "version": (2,7,10),
+>>>>>>> Collection Manager: Expander fixes. Task: T69577
     "blender": (2, 80, 0),
     "location": "View3D - Object Mode (Shortcut - M)",
     "warning": '',  # used for warning icon and text in addons panel