Merged

suitangi · Jan 26, 2024 · 724968b · 724968b
2 parents b22d8ea + b7c7fe5
commit 724968b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/scripts/index.js b/scripts/index.js
@@ -621,7 +621,11 @@ function gameWinDaily() {
         action: function(linkButton) {
           let d = new Date();
           let str =
+<<<<<<< HEAD
             `Daily Befuddle ${d.toLocaleDateString("en-US")}\n${wr}/${window.game.daily.lives}${(window.gameSesh.hideBlanks ? '*' : '')}\n${window.location.href}`;
+=======
+            `Daily Befuddle${d.toLocaleDateString("en-US")}\n${wr}/${window.game.daily.lives}${(window.gameSesh.hideBlanks ? '*' : '')}\n${window.location.href}`;
+>>>>>>> b7c7fe59f06d0138cdd8160c5438766093ee8f0a
           clipboardHandler(linkButton, str);
           return false;
         }