From b33b28dd078bdd14a2d832e95bbdc015c4eff062 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 12 Jan 2021 08:16:00 +0100
Subject: [PATCH] Activate onStartupFinished (#110031)

---
 extensions/merge-conflict/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 708166d4508..ab645a38f22 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -14,7 +14,7 @@
     "Other"
   ],
   "activationEvents": [
-    "*"
+    "onStartupFinished"
   ],
   "main": "./out/mergeConflictMain",
   "browser": "./dist/browser/mergeConflictMain",