Resolve conflicts

odsantos · web-flow · commit e7dee39e5cf3 · 2020-10-02T00:06:52.000+01:00
diff --git a/2-ui/99-ui-misc/02-selection-range/article.md b/2-ui/99-ui-misc/02-selection-range/article.md
@@ -632,11 +632,7 @@ The most used recipes are probably:
     }
     ```
 2. Setting the selection:
-<<<<<<< HEAD
-    ```js run
-=======
     ```js
->>>>>>> e074a5f825a3d10b0c1e5e82561162f75516d7e3
     let selection = document.getSelection();
 
     // directly:
