From 017016a8de25709b11febb0252b57824339e9151 Mon Sep 17 00:00:00 2001
From: mehekj <mehek.jethani@gmail.com>
Date: Sat, 5 Feb 2022 12:59:40 -0500
Subject: fixed merge conflicts

---
 src/client/views/collections/CollectionStackedTimeline.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/client/views/collections')

diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx
index 9a8b2940f..25f2e0b25 100644
--- a/src/client/views/collections/CollectionStackedTimeline.tsx
+++ b/src/client/views/collections/CollectionStackedTimeline.tsx
@@ -661,7 +661,7 @@ export class CollectionStackedTimeline extends CollectionSubView<
                                     height={height}
                                     toTimeline={this.toTimeline}
                                     layoutDoc={this.layoutDoc}
-                                    isDocumentActive={this.props.childDocumentsActive ? this.props.isDocumentActive : this.isContentActive}
+                                    // isDocumentActive={this.props.childDocumentsActive ? this.props.isDocumentActive : this.isContentActive}
                                     currentTimecode={this.currentTimecode}
                                     _timeline={this._timeline}
                                     stackedTimeline={this}
-- 
cgit v1.2.3-70-g09d2