fix

thirotan · Dec 11, 2015 · 81d3e52 · 81d3e52
1 parent 8d1b4ad
commit 81d3e52
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/spec/requests/authentication_pages_spec.rb b/spec/requests/authentication_pages_spec.rb
@@ -28,11 +28,7 @@
 
     describe "with valid information" do
       let(:user) { FactoryGirl.create(:user) }
-<<<<<<< HEAD
-      before { valid_signin(user) }
-=======
       before { sign_in user  }
->>>>>>> updating-users
 
       it { is_expected.to have_title(user.name) }
       it { is_expected.to have_link('Users',        href: users_path) }