From edcdbee8d0a0439a10bdfb64a8287ff5e8330e25 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Tue, 2 Jun 2015 15:45:49 -0300
Subject: [PATCH] removing merge conflit

---
 app/views/tasks/index.html.erb                               |  3 ---
 db/migrate/20150223180807_add_private_token_info_to_users.rb | 11 -----------
 2 files changed, 0 insertions(+), 14 deletions(-)
 delete mode 100644 db/migrate/20150223180807_add_private_token_info_to_users.rb

diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 5208b93..07325c5 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -35,9 +35,6 @@
       </p>
     <% end %>
     <p>
-      <%= labelled_select(_('Assigned to')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates) %>
-    </p>
-    <p>
       <%= submit_button(:search, _('Search')) %>
     </p>
   <% end %>
diff --git a/db/migrate/20150223180807_add_private_token_info_to_users.rb b/db/migrate/20150223180807_add_private_token_info_to_users.rb
deleted file mode 100644
index 82b21d2..0000000
--- a/db/migrate/20150223180807_add_private_token_info_to_users.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddPrivateTokenInfoToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :private_token, :string
-    add_column :users, :private_token_generated_at, :datetime
-  end
-
-  def self.down
-    remove_column :users, :private_token
-    remove_column :users, :private_token_generated_at
-  end
-end
--
libgit2 0.21.2