Merge branch 'master' into more-extension

# Conflicts: # example/App.js # lib/Link.js # lib/ReactUeditor.js # src/Link.js # src/ReactUeditor.js
ifanrx · Jan 7, 2019 · 400d304 · 400d304
2 parents 01c9c08 + 9ca6a85
commit 400d304
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/lib/Link.js b/lib/Link.js
@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _Button = _interopRequireDefault(require("./Button"));
-
 var _Input = _interopRequireDefault(require("./Input"));
 
 var _react = _interopRequireDefault(require("react"));

diff --git a/src/Link.js b/src/Link.js
@@ -1,4 +1,3 @@
-import Button from './Button'
 import Input from './Input'
 import React from 'react'
 

diff --git a/ueditor/ueditor.config.js b/ueditor/ueditor.config.js
@@ -493,4 +493,3 @@
         };
 
     })();
-