From c3581eb012e0662ada7bc305dd301e50039fa4e1 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Wed, 28 Jan 2015 12:51:10 -0300
Subject: [PATCH] chat: fix merge problem

---
 public/javascripts/application.js | 3 ---
 1 file changed, 0 insertions(+), 3 deletions(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 7d5d8f7..0a7a6d5 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -521,9 +521,6 @@ function userDataCallback(data) {
   noosfero.user_data = data;
   if (data.login) {
     // logged in
-    if (data.chat_enabled) {
-      setInterval(function(){ jQuery.getJSON(user_data, chatOnlineUsersDataCallBack)}, 10000);
-    }
     jQuery('head').append('<meta content="authenticity_token" name="csrf-param" />');
     jQuery('head').append('<meta content="'+jQuery.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
   }
--
libgit2 0.21.2