コード整理

public_new/chat.html

@@ -131,6 +131,7 @@
     $("#loadingArea").load("./loading.html");
     android.getLoginParameter();
     android.getGlobalParameter();
+    android.saveSelectedUserList("");
 
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;

public_new/css/chat.css

@@ -103,10 +103,6 @@ input[name="tab_item"] {
   overflow: hidden;
   margin: 0 auto;
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> 20fd104461a13632e6bf4112a272fa5d3e82c248
 .chat_item_l .thumbnail img{
   width: 50px;
   height: 50px;
@@ -116,11 +112,6 @@ input[name="tab_item"] {
   height: 25px;
   float: left;
 }
-
-<<<<<<< HEAD
-=======
-
->>>>>>> 20fd104461a13632e6bf4112a272fa5d3e82c248
 .chat_item_l .thumbnail3 .img_wrap:nth-child(1) {
     width: 25px;
     height: 50px;