From: Evan You <yyx990803@gmail.com>
Date: Tue, 2 Oct 2018 22:33:05 +0000 (-0400)
Subject: chore: merge imports
X-Git-Tag: v3.0.0-alpha.0~1157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4481a49e817fecdbad61c3f3815a1b440568f7f;p=thirdparty%2Fvuejs%2Fcore.git

chore: merge imports
---

diff --git a/packages/core/src/componentProps.ts b/packages/core/src/componentProps.ts
index 0d1f0e8aa0..d3e9d667a7 100644
--- a/packages/core/src/componentProps.ts
+++ b/packages/core/src/componentProps.ts
@@ -1,10 +1,9 @@
-import { EMPTY_OBJ, nativeOnRE, vnodeHookRE } from './utils'
+import { immutable, unwrap, lock, unlock } from '@vue/observer'
 import {
   ComponentClass,
   MountedComponent,
   FunctionalComponent
 } from './component'
-import { immutable, unwrap, lock, unlock } from '@vue/observer'
 import {
   Data,
   ComponentPropsOptions,
@@ -12,7 +11,14 @@ import {
   Prop,
   PropType
 } from './componentOptions'
-import { camelize, hyphenate, capitalize } from './utils'
+import {
+  EMPTY_OBJ,
+  nativeOnRE,
+  vnodeHookRE,
+  camelize,
+  hyphenate,
+  capitalize
+} from './utils'
 
 export function initializeProps(instance: MountedComponent, data: Data | null) {
   const { props, attrs } = resolveProps(