Merging.

app/helpers/todos_helper.rb

@@ -117,11 +117,7 @@ module TodosHelper
       "<span class=\"tag\">" + 
         link_to(t.name, {:action => "tag", :controller => "todos", :id => t.name+".m"}) + 
       "</span>"}.join('')
-<<<<<<< HEAD/app/helpers/todos_helper.rb
     if tag_list.empty? then "" else "<span class=\"tags\">#{tag_list}</span>" end
-=======
-    if not tag_list.empty? then "<span class=\"tags\">#{tag_list}</span>" end
->>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/helpers/todos_helper.rb
   end
   
   def deferred_due_date

app/views/contexts/_mobile_context.rhtml

@@ -6,17 +6,10 @@ if not @not_done.empty?
   # only show a context when there are actions in it
   -%>
 <h2><%=mobile_context.name%></h2>
-<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
 <ul class="c">
-=======
 <table cellpadding="0" cellspacing="0" border="0" class="c">
->>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml
 <%= render :partial => "todos/mobile_todo", 
            :collection => @not_done, 
            :locals => { :parent_container_type => "context" }-%>
-<<<<<<< HEAD/app/views/contexts/_mobile_context.rhtml
 </ul>
-<% end -%>=======
-</table>
 <% end -%>
->>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/contexts/_mobile_context.rhtml

app/views/todos/_mobile_todo.rhtml

@@ -6,11 +6,7 @@ else
   bullet = "<span class=\"r\">&raquo;&nbsp;</span>"
   li_class = ""
 end -%>
-<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml
 <li id="<%= dom_id(mobile_todo) %>" <%= li_class %>><%= bullet %><% 
-=======
-<tr class="t" id="<%= dom_id(mobile_todo) %>" valign="top"><td><%= bullet %></td><td><% 
->>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/todos/_mobile_todo.rhtml
     if mobile_todo.completed?  
 -%><span class="m_t_d">
 <%  else 
@@ -28,7 +24,4 @@ end -%>
        ")</span>" -%>
 <%  end -%>
  <%= tag_list_mobile -%>
-<<<<<<< HEAD/app/views/todos/_mobile_todo.rhtml
-</span></li>=======
-</span></td></tr>
->>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/app/views/todos/_mobile_todo.rhtml
+</span></li>

public/stylesheets/mobile.css

@@ -124,7 +124,6 @@ span.prj, span.ctx{
 
 .errors {
       background: #FFC2C2;
-<<<<<<< HEAD/public/stylesheets/mobile.css
 }
 
 ul.c li.star {
@@ -156,10 +155,8 @@ span.r {
 
 #database_auth_form table td {
   width:7em;
-}=======
 }
 
 table.c {
       margin-left: 5px;
 }
->>>>>>> f3d7fac2a4e602c21c754770903217c0a5035629/public/stylesheets/mobile.css