merging all conflicts

Author: iliakan

1-js/11-async/05-promise-api/article.md

@@ -243,12 +243,21 @@ Zde je příklad, v němž všechny přísliby selžou:
 
 ```js run
 Promise.any([
+<<<<<<< HEAD
   new Promise((resolve, reject) => setTimeout(() => reject(new Error("Au!")), 1000)),
   new Promise((resolve, reject) => setTimeout(() => reject(new Error("Chyba!")), 2000))
 ]).catch(chyba => {
   console.log(chyba.constructor.name); // AggregateError
   console.log(chyba.errors[0]); // Error: Au!
   console.log(chyba.errors[1]); // Error: Chyba
+=======
+  new Promise((resolve, reject) => setTimeout(() => reject(new Error("Ouch!")), 1000)),
+  new Promise((resolve, reject) => setTimeout(() => reject(new Error("Error!")), 2000))
+]).catch(error => {
+  console.log(error.constructor.name); // AggregateError
+  console.log(error.errors[0]); // Error: Ouch!
+  console.log(error.errors[1]); // Error: Error!
+>>>>>>> 2cca9a9d09fdd45819832294225aa3721fa5a2d4
 });
 ```
 

2-ui/1-document/04-searching-elements-dom/article.md

@@ -154,7 +154,7 @@ For instance:
 <div class="contents">
   <ul class="book">
     <li class="chapter">Chapter 1</li>
-    <li class="chapter">Chapter 1</li>
+    <li class="chapter">Chapter 2</li>
   </ul>
 </div>