From e39e6536f57aa2d51e7a3024ae245e3d2f82c8ac Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Wed, 5 Dec 2012 16:12:24 +0800
Subject: [PATCH] journal list

---
 .../desktop/journal_lists/index.html.erb      | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb
index d9b7de3d..804787df 100644
--- a/app/views/desktop/journal_lists/index.html.erb
+++ b/app/views/desktop/journal_lists/index.html.erb
@@ -8,29 +8,15 @@
             <div class="g_col w4">
             <ul>
               <% end %>
-              <li class="">
-                <%= journal_list %>
+              <li class="s_grid_row">
+                <% title, level = journal_list %>
+                <%= title %> -- <%= level.join(",") %>
               </li>
               <% if ( i % 8 ) == 7 %>
             </ul>
             </div>
           <% end %>
         <% end %>
-<<<<<<< HEAD
-
-        <li class="s_grid_row">
-          <% title, level = journal_list %>
-          <%= title %> -- <%= level.join(",") %>
-        </li>
-
-        <% if ( i % 5 ) == 4 %>
-          </ul>
-          </div>
-        <% end %>
-      <% end %>
-
-=======
->>>>>>> view update
     </div>
   </div>
 </div>