From ca93a583b4b7f86f6da4a3caaece8619a357199e Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Mon, 21 Dec 2009 22:24:45 -0500 Subject: add --- template/chat.st | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/template/chat.st b/template/chat.st index 9095901..8270ce7 100755 --- a/template/chat.st +++ b/template/chat.st @@ -12,7 +12,30 @@ jQuery(document).ready(initChat); var Nick = $json_user_nick$; - + @@ -28,17 +51,10 @@

$users: { u | -<<<<<<< HEAD:template/chat.st -

$u$
-

$u$
+

}$ -

-======= -

$u$

- }$ - ->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:template/chat.st - +

$messages: { m | -- cgit v1.2.3-70-g09d2