Merged

js/scrollables.js

@@ -29,8 +29,6 @@ const check = () => {
 }
 
 ['scroll', 'resize'].forEach(e => window.addEventListener(e, check))
-<<<<<<< HEAD
-=======
 
 document.addEventListener('DOMContentLoaded', function () {
     const links = document.querySelectorAll('a');
@@ -39,5 +37,4 @@ document.addEventListener('DOMContentLoaded', function () {
             // event.preventDefault();
         });
     });
-});
->>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
+});