Permalink
Browse files

Ignore eclipse tmp files

  • Loading branch information...
1 parent fa3860a commit 4720b6502051390fcf3afe9c51a1d99cc800300c @atd atd committed Nov 23, 2010
Showing with 1 addition and 38 deletions.
  1. +1 −0 .gitignore
  2. +0 −38 app/views/users/.tmp__contacts.html.erb.18666~
View
@@ -1,2 +1,3 @@
.bundle
pkg/*gem
+**.tmp_*
@@ -1,38 +0,0 @@
-<<<<<<< HEAD
- <div class="future_conference" id="contacts">
- <div class="future_header">
- <div class="title_section">
- <%= image_tag("btn/btn_follower.png", :alt =>"follower") %>2.520 Contacts
- </div>
- <div class="title_righ">
- <a href="#">Ver Todas</a>
- </div>
- </div>
- <div class="post_future_conference">
- <div class="future_content_center">
- <%=link_to ( (image_tag ( "albums/1.png", :alt => @user.name , :size => "40x40")) , @user) %>
- <%=link_to ( (image_tag ( "albums/2.png", :alt => @user.name , :size => "40x40")) , @user) %>
- <%=link_to ( (image_tag ( "albums/3.png", :alt => @user.name , :size => "40x40")) , @user) %>
- <%=link_to ( (image_tag ( "albums/4.png", :alt => @user.name , :size => "40x40")) , @user) %>
- </div>
- </div>
- </div>
-=======
-<div class="contacts_header">
- <%=image_tag("btn/btn_friend.png", :class => "contacts_icon")%>
- <div class="contacts_text_header">
- <%= @user.friends.count %> <%= t('friend', :count => @user.friends.count) %>
- </div>
-</div>
-<div class ="contacts">
- <div class="contact">
- <%@user.friends.all.each do |friend|%>
- <%=link_to((image_tag (friend.logo.url, :alt => friend.name , :size => "40x40")) , friend)%>
- <%end%>
- </div>
-</div>
-<div class="contacts_footer">
- <%=link_to((image_tag("btn/btn_next.png", :alt => "next")) , users_path) %>
-</div>
->>>>>>> bb9eb705b65c784edf0b1070db65b6b13daf8656
-

0 comments on commit 4720b65

Please sign in to comment.