anchor.diff:        <th colspan="3"></th>
       </tr>
     </thead>
  -=======
  + 
  +<tbody> 
  +  <% @landslides.each do |landslide| %> 
   
  +    <tr> 
  + 
  +        <td><%= landslide.country %></td> 
  +        <td><%= landslide.latitude %></td> 
  +        <td><%= landslide.longitude %></td> 
  +        <td><%= landslide.city %></td> 
  +        <td><%= landslide.description %></td> 
  +        <td><%= landslide.comment %></td> 
  +        <td><%= landslide.weather %></td> 
  +        <td><%= landslide.temp %></td> 
  +        <td><%= landslide.humidity %></td> 
  +        <td><%= landslide.date %></td> 
  +        <td><%= link_to 'Show', landslide %></td> 
  +        <td><%= link_to 'Edit', edit_landslide_path(landslide) %></td> 
  +        <td><%= link_to 'Destroy', landslide, method: :delete, data: { confirm: 'Are you sure?' } %></td> 
   
  -<h2>Elevator Pitch</h2>
  ->>>>>>> 78ed50319c1544e34bd41feccd794fac5079970c
  +    </tr> 
   
  -<p>TochiSlide is for Brunei people who want to avoid landslides.
  +   <% end %> 
   
  -In this website, you can share your information about landslides. 
  +  </tbody> 
  +</table> 
   
  -TochiSlide is better than Google Map or any other weather forecasts,
  +<br> 
   
  -because it provides combined information such as OpenWeaterMap and people's reports. 
  + 
  +<%= link_to 'New Landslide', new_landslide_path %> 
  +<div style='width: 800px;'> 
  +<div id="map" style='width: 800px; height: 400px;'></div> 
  +</div> 
   
  -<<<<<<< HEAD
   <script type="text/javascript">
   handler = Gmaps.build('Google');
   handler.buildMap({ provider: {}, internal: {id: 'map'}}, function(){
  
positive.code: <h1>TochiSlide</h1>
  
  <<<<<<< HEAD
  <h1>Listing Landslides</h1>
  
  <%# form_for の代わりに search_form_for を使うことで検索フォームを作成 %>
  <%= search_form_for @q do |f| %>
  
negative.code:   handler.fitMapToBounds();
  });
  </script>
  