[CRON] sync translated content

5 files changed, 34 insertions, 28 deletions

diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index dec0d5b016..f8ecb5e8f5 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -313,6 +313,9 @@
 /ko/docs/Learn/HTML/Forms/Your_first_HTML_form	/ko/docs/Learn/Forms/Your_first_form
 /ko/docs/Learn/HTML/Howto/데이터_속성_사용하기	/ko/docs/Learn/HTML/Howto/Use_data_attributes
 /ko/docs/Learn/HTML/Multimedia_and_embedding/ideo_and_audio_content	/ko/docs/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
+/ko/docs/Learn/JavaScript/Asynchronous/Async_await	/ko/docs/conflicting/Learn/JavaScript/Asynchronous/Promises
+/ko/docs/Learn/JavaScript/Asynchronous/Concepts	/ko/docs/conflicting/Learn/JavaScript/Asynchronous/Introducing
+/ko/docs/Learn/JavaScript/Asynchronous/Timeouts_and_intervals	/ko/docs/conflicting/Learn/JavaScript/Asynchronous
 /ko/docs/Learn/JavaScript/Building_blocks/조건문	/ko/docs/Learn/JavaScript/Building_blocks/conditionals
 /ko/docs/Learn/JavaScript/Objects/Inheritance	/ko/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
 /ko/docs/Learn/JavaScript/Objects/Object-oriented_JS	/ko/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index b4a8b6a3ff..ecc1af296f 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -1888,22 +1888,6 @@
       "Sheppy"
     ]
   },
-  "Learn/JavaScript/Asynchronous/Async_await": {
-    "modified": "2020-11-28T09:53:12.946Z",
-    "contributors": [
-      "HerbertLim",
-      "chupark"
-    ]
-  },
-  "Learn/JavaScript/Asynchronous/Concepts": {
-    "modified": "2020-11-17T21:41:39.368Z",
-    "contributors": [
-      "mochapoke",
-      "Plut0",
-      "chupark",
-      "eunjungleecub"
-    ]
-  },
   "Learn/JavaScript/Asynchronous/Introducing": {
     "modified": "2020-11-17T21:53:14.519Z",
     "contributors": [
@@ -1918,12 +1902,6 @@
       "chupark"
     ]
   },
-  "Learn/JavaScript/Asynchronous/Timeouts_and_intervals": {
-    "modified": "2020-07-16T22:33:21.049Z",
-    "contributors": [
-      "cjkcc69"
-    ]
-  },
   "Learn/JavaScript/Building_blocks": {
     "modified": "2020-07-16T22:31:09.649Z",
     "contributors": [
@@ -17457,6 +17435,28 @@
       "Kaben"
     ]
   },
+  "conflicting/Learn/JavaScript/Asynchronous": {
+    "modified": "2020-07-16T22:33:21.049Z",
+    "contributors": [
+      "cjkcc69"
+    ]
+  },
+  "conflicting/Learn/JavaScript/Asynchronous/Introducing": {
+    "modified": "2020-11-17T21:41:39.368Z",
+    "contributors": [
+      "mochapoke",
+      "Plut0",
+      "chupark",
+      "eunjungleecub"
+    ]
+  },
+  "conflicting/Learn/JavaScript/Asynchronous/Promises": {
+    "modified": "2020-11-28T09:53:12.946Z",
+    "contributors": [
+      "HerbertLim",
+      "chupark"
+    ]
+  },
   "conflicting/Learn/JavaScript/Objects": {
     "modified": "2019-03-23T23:29:46.029Z",
     "contributors": [
diff --git a/files/ko/learn/javascript/asynchronous/timeouts_and_intervals/index.html b/files/ko/conflicting/learn/javascript/asynchronous/index.html
index 378f0a5f55..19f9ffd02d 100644
--- a/files/ko/learn/javascript/asynchronous/timeouts_and_intervals/index.html
+++ b/files/ko/conflicting/learn/javascript/asynchronous/index.html
@@ -1,7 +1,8 @@
 ---
 title: 'Cooperative asynchronous JavaScript: Timeouts and intervals'
-slug: Learn/JavaScript/Asynchronous/Timeouts_and_intervals
+slug: conflicting/Learn/JavaScript/Asynchronous
 translation_of: Learn/JavaScript/Asynchronous/Timeouts_and_intervals
+original_slug: Learn/JavaScript/Asynchronous/Timeouts_and_intervals
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ko/learn/javascript/asynchronous/concepts/index.html b/files/ko/conflicting/learn/javascript/asynchronous/introducing/index.html
index 8b1a12bf46..7e3d68c37d 100644
--- a/files/ko/learn/javascript/asynchronous/concepts/index.html
+++ b/files/ko/conflicting/learn/javascript/asynchronous/introducing/index.html
@@ -1,11 +1,12 @@
 ---
 title: 일반적인 비동기 프로그래밍 개념
-slug: Learn/JavaScript/Asynchronous/Concepts
+slug: conflicting/Learn/JavaScript/Asynchronous/Introducing
 tags:
   - 비동기
   - 비동기 프로그래밍
   - 자바스크립트
 translation_of: Learn/JavaScript/Asynchronous/Concepts
+original_slug: Learn/JavaScript/Asynchronous/Concepts
 ---
 <div>{{LearnSidebar}}{{NextMenu("Learn/JavaScript/Asynchronous/Introducing", "Learn/JavaScript/Asynchronous")}}</div>
 
diff --git a/files/ko/learn/javascript/asynchronous/async_await/index.html b/files/ko/conflicting/learn/javascript/asynchronous/promises/index.html
index 92a9d81dc6..bbe8ee7812 100644
--- a/files/ko/learn/javascript/asynchronous/async_await/index.html
+++ b/files/ko/conflicting/learn/javascript/asynchronous/promises/index.html
@@ -1,6 +1,6 @@
 ---
 title: async와 await를 사용하여 비동기 프로그래밍을 쉽게 만들기
-slug: Learn/JavaScript/Asynchronous/Async_await
+slug: conflicting/Learn/JavaScript/Asynchronous/Promises
 tags:
   - Beginner
   - CodingScripting
@@ -11,6 +11,7 @@ tags:
   - async
   - asynchronous
   - await
+original_slug: Learn/JavaScript/Asynchronous/Async_await
 ---
 <div>{{LearnSidebar}}</div>
 
@@ -304,7 +305,7 @@ displayContent()
    }
    return newArr;
  }
- 
+
  async function getResult() {
    let result = await makeResult(items); // Blocked on this line
    useThatResult(result); // Will not be executed before makeResult() is done
@@ -390,8 +391,8 @@ let han = new Person('Han', 'Solo', 25, 'male', ['Smuggling']);</pre>
 
 <h2 id="Browser_support">브라우저 지원</h2>
 
-<p>async/await 사용 여부를 결정할 때 고려해야 할 한가지 사항은 이전 브라우저에 대한 지원입니다. 
-  promises와 마찬가지로 대부분의 최신 브라우저에서 사용할 수 있습니다. 
+<p>async/await 사용 여부를 결정할 때 고려해야 할 한가지 사항은 이전 브라우저에 대한 지원입니다.
+  promises와 마찬가지로 대부분의 최신 브라우저에서 사용할 수 있습니다.
   주요 지원 문제는 Internet Explorer 그리고 Opera Mini에서 발생합니다.</p>
 
 <p>async/await을 사용하는데 브라우저 지원이 걱정되는 경우 <a href="https://babeljs.io/">BabelJS</a> 라이브러리를 사용하는 것을 고려해 볼 수 있습니다. BabelJS는 최신 자바스크립트를 사용하여 애플리케이션을 작성하고 사용자 브라우저에 필요한 변경사항을 Babel이 파악할 수 있도록 지원합니다. async/await를 지원하지 않는 브라우저를 만나면 Babel은 이전 브라우저에서 작동하는 polyfill를 자동으로 제공합니다.</p>