Auto stash before merge of "master" and "origin/master"

cswendrowski · Jul 20, 2020 · dc3c00a · dc3c00a
1 parent 2f1ae73
commit dc3c00a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 
 # Tabbed Chatlog
 
-Splits the Chatlog into In Character (per scene), Rolls (per scene), and Out of Character (global).
+Splits up the chat into smaller tabs
 
-![](./tabbed-chatlog.gif)
+![](https://media.discordapp.net/attachments/724717068364283924/731330729375432814/Chat.png)
 
 
 

diff --git a/tabbed-chatlog.js b/tabbed-chatlog.js
@@ -71,6 +71,7 @@ Hooks.on("renderChatLog", async function(chatLog, html, user) {
         console.log("Unknown tab " + tab + "!");
       }
 
+      console.log("Scrollin");
       $("#chat-log").scrollTop(9999999);
     } 
   });
-Original file line number
+Diff line change
@@ Expand Up @@
             console.log("Unknown tab " + tab + "!");
           }
+          console.log("Scrollin");
           $("#chat-log").scrollTop(9999999);
         }
       });
@@ Expand Down @@