Fixed

1 files changed, 7 insertions, 1 deletions

diff --git a/template/chat.st b/template/chat.st
index e48b754..9095901 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -28,15 +28,21 @@
           </div>
       <div id="userList">
             $users: { u |
+<<<<<<< HEAD:template/chat.st
     <div class="username"><img src="/static/cat.jpeg" width="50" height="50">$u$ <br>
     </div>
         }$
       </div>
+=======
+            <div><a href="/u/$u$">$u$</a></div>
+            }$
+          </div>
+>>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:template/chat.st
           
           <div id="messagePane">
             <div id="messageList">
               $messages: { m |
-                  <div class="msgDiv oldmsg"><b>$m.nick$: </b>
+              <div class="msgDiv oldmsg"><b><a href="/u/$m.nick$">$m.nick$</a>: </b>
                     <span class="content">$m.content$<span></div>
               }$
               <hr />