[mirotalk] - fix merge conflicts

2021-01-23 22:30:36 +01:00
parent 15e2bd1377 70c30d6606
commit 0f0799963a
1 changed files with 2 additions and 1 deletions
@@ -1098,4 +1098,5 @@ function formatDate(date) {
  const h = "0" + date.getHours();
  const m = "0" + date.getMinutes();
  return `${h.slice(-2)}:${m.slice(-2)}`;
-}
+}
+