Merge branch 'master' of github.com:ransome1/sleek

src/js/recurrences.mjs

@@ -56,6 +56,10 @@ function getRecurrenceDate(due, recurrence) {
         let bdays_left = recSplit.mul;
         let millisec_due = due.getTime();
         let day_of_week = due.getDay(); // 0=Sunday, 1..5 weekday, 6=Saturday
+<<<<<<< HEAD
+=======
+
+>>>>>>> e518900a46d21e107be1926e260984ff238c1f9f
         while (bdays_left > 0) {
           millisec_due += 1000 * 60 * 60 * 24;  // add a day to time
           day_of_week = (day_of_week + 1)% 7;  // new day of week

yarn.lock

@@ -6128,9 +6128,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^7.2.3, ws@^7.4.4:
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
-  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"