Skip to content

Commit 564624d

Browse files
committed
Resolve merge conflict
Related to 8cf11dc
1 parent 8e16daa commit 564624d

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

content/docs/web-components.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,5 @@ customElements.define('x-search', XSearch);
5757

5858
>주의
5959
>
60-
<<<<<<< HEAD
6160
>Babel로 클래스를 변환하면 이 코드가 작동하지 **않을 것**입니다. [해당 문제](https://github.com/w3c/webcomponents/issues/587)를 참조해주시기 바랍니다.
62-
>이 문제를 해결하려면 웹 컴포넌트를 불러오기 전에 [custom-elements-es5-adapter](https://github.com/webcomponents/webcomponentsjs#custom-elements-es5-adapterjs)를 추가하기 바랍니다.
63-
=======
64-
>This code **will not** work if you transform classes with Babel. See [this issue](https://github.com/w3c/webcomponents/issues/587) for the discussion.
65-
>Include the [custom-elements-es5-adapter](https://github.com/webcomponents/polyfills/tree/master/packages/webcomponentsjs#custom-elements-es5-adapterjs) before you load your web components to fix this issue.
66-
>>>>>>> 6dcb963479953586f462ce31fddf35158c0598a0
61+
>이 문제를 해결하려면 웹 컴포넌트를 불러오기 전에 [custom-elements-es5-adapter](https://github.com/webcomponents/polyfills/tree/master/packages/webcomponentsjs#custom-elements-es5-adapterjs)를 추가하기 바랍니다.

0 commit comments

Comments
 (0)