Merge branch 'master' of ssh://dump.fm/pichat/repo

1 files changed, 4 insertions, 0 deletions

diff --git a/static/pichat.js b/static/pichat.js
index d489bba..b12041c 100755
--- a/static/pichat.js
+++ b/static/pichat.js
@@ -15,8 +15,12 @@ function escapeHtml(txt) {
 }
 
 function buildUserDiv(user) {
+<<<<<<< HEAD:static/pichat.js
+    return '<div class="username"><img src="/static/cat.jpeg" width="50" height="50">' + escapeHtml(user) + '</div>';
+=======
     var nick = escapeHtml(user);
     return '<div><a href="/u/' + nick  + '">' + nick + '</a></div>';
+>>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/pichat.js
 }
 
 // http://stackoverflow.com/questions/37684/replace-url-with-html-links-javascript