Resolve qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb

0e59a8e5 · Lin Jen-Shin · 51ded590 · 0e59a8e5
Commit 0e59a8e5 authored Nov 06, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb ...specs/features/browser_ui/1_manage/login/register_spec.rb +0 -4

No files found.
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -5,11 +5,7 @@ module QA
    it 'user registers and logs in' do
      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-<<<<<<< HEAD
      Resource::User.fabricate_via_browser_ui!
-=======
-      Resource::User.fabricate!
->>>>>>> upstream/master
      # TODO, since `Signed in successfully` message was removed
      # this is the only way to tell if user is signed in correctly.