From 22338c7055ef59bbabb25fe7094cd86c1d5ba286 Mon Sep 17 00:00:00 2001
From: zazzaz <izazzaz@hotmail.com>
Date: Thu, 13 Aug 2020 11:03:08 +0800
Subject: [PATCH] fix: update merge

---
 packages/element-plus/index.ts     | 3 +++
 packages/element-plus/package.json | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/element-plus/index.ts b/packages/element-plus/index.ts
index 0c389dfcb4..4c758415e8 100644
--- a/packages/element-plus/index.ts
+++ b/packages/element-plus/index.ts
@@ -19,6 +19,7 @@ import ElNotification from '@element-plus/notification'
 import ElPageHeader from '@element-plus/page-header'
 import ElRadio from '@element-plus/radio'
 import ElScrollBar from '@element-plus/scrollbar'
+import ElCollapse from '@element-plus/collapse'
 
 export {
   ElAvatar,
@@ -41,6 +42,7 @@ export {
   ElPageHeader,
   ElScrollBar,
   ElRadio,
+  ElCollapse,
 }
 
 export default function install(app: App): void {
@@ -64,4 +66,5 @@ export default function install(app: App): void {
   ElPageHeader(app)
   ElScrollBar(app)
   ElRadio(app)
+  ElCollapse(app)
 }
diff --git a/packages/element-plus/package.json b/packages/element-plus/package.json
index 8b020cae67..b5d36fb5b7 100644
--- a/packages/element-plus/package.json
+++ b/packages/element-plus/package.json
@@ -32,6 +32,7 @@
     "@element-plus/radio": "^0.0.0",
     "@element-plus/page-header": "^0.0.0",
     "@element-plus/scrollbar": "^0.0.0",
-    "@element-plus/notification": "^0.0.0"
+    "@element-plus/notification": "^0.0.0",
+    "@element-plus/collapse": "^0.0.0"
   }
 }