Merge remote-tracking branch 'origin/main' into main

HadockKali · Mar 4, 2021 · 27102cc · 27102cc
2 parents 6908d98 + 1510db6
commit 27102cc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/engine.js b/engine.js
@@ -6,7 +6,11 @@ let $playfield = document.querySelector(".playfield"),
   };
 
 let mobile = isMobile().any;
+<<<<<<< HEAD
 // main kbd = desktop keyboard | lista de posibilitati combinatii
+=======
+// main kbd = desktop keyboard lista de posibilitati combinatii
+>>>>>>> main
 let Password = {
   current: [],