|
1044 | 1044 | resolved "https://registry.yarnpkg.com/@groupher/editor-delimiter/-/editor-delimiter-1.1.4.tgz#b4c72b9f9c8da70f6fd479aa70740b25db2d0783"
|
1045 | 1045 | integrity sha512-8QgSDx2KXFtfYW+THXKGs8tU8RhkwFosTQpjOTnlJj+alLlIm2qSnTdTCM9W8Z2JqgC3UAmcfn171WE9sfteYA==
|
1046 | 1046 |
|
1047 |
| -<<<<<<< HEAD |
1048 |
| -"@groupher/editor-embed@1.0.2": |
1049 |
| -version "1.0.2" |
1050 |
| -resolved "https://registry.npm.taobao.org/@groupher/editor-embed/download/@groupher/editor-embed-1.0.2.tgz#1adb08c71c73d699a68b4d58d1fff4e861328ff8" |
1051 |
| -dependencies: |
1052 |
| -svg-inline-loader "^0.8.0" |
1053 |
| -tippy.js "^5.0.1" |
1054 |
| - |
1055 |
| -"@groupher/editor-embed@1.0.4": |
1056 |
| -version "1.0.4" |
1057 |
| -resolved "https://registry.yarnpkg.com/@groupher/editor-embed/-/editor-embed-1.0.4.tgz#ce256acf307c5feeccf50b81da9691d6d006725d" |
1058 |
| -integrity sha512-LUi/kCDci+w0fTLZ+UBv1ePVxMoO0MuBbPiN8ys4twUVE9q561NAZORNGxle7dAUDvkQvIGdvlzu1onyEzXvxA== |
1059 |
| -======= |
1060 | 1047 | "@groupher/editor-embed@1.0.8":
|
1061 | 1048 | version "1.0.8"
|
1062 | 1049 | resolved "https://registry.npm.taobao.org/@groupher/editor-embed/download/@groupher/editor-embed-1.0.8.tgz?cache=0&sync_timestamp=1571143607100&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40groupher%2Feditor-embed%2Fdownload%2F%40groupher%2Feditor-embed-1.0.8.tgz#ac8e5a2d312810e6180c7539e90dcc1bbe9cc179"
|
1063 |
| ->>>>>>> feat(editor): rm plugin deps & update global styles |
1064 | 1050 | dependencies:
|
1065 | 1051 | svg-inline-loader "^0.8.0"
|
1066 | 1052 | tippy.js "^5.0.1"
|
|