From eacad9ac046c5ab8a07b256164cdc247c16a6ed3 Mon Sep 17 00:00:00 2001
From: adrienbaron <adrien@abaron.net>
Date: Thu, 6 Sep 2018 15:26:08 +0200
Subject: [PATCH] chore: remove unnecessary else in mergeDataInResult

---
 src/shared/getComponentOption.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/shared/getComponentOption.js b/src/shared/getComponentOption.js
index 267421d..5cdfe1f 100644
--- a/src/shared/getComponentOption.js
+++ b/src/shared/getComponentOption.js
@@ -72,7 +72,6 @@ function mergeDataInResult (data, result, component, arrayMerge) {
   if (typeof data === 'object') {
     // merge with existing options
     return deepmerge(result, data, { arrayMerge })
-  } else {
-    return data
   }
+  return data
 }