Resolve conflicts in system check tasks

62f5558f · Michael Kozono · bb5194f5 · 62f5558f · 62f5558f
Commit 62f5558f authored Dec 05, 2018 by Michael Kozono
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

lib/system_check/rake_task/app_task.rb lib/system_check/rake_task/app_task.rb +0 -3

lib/system_check/rake_task/gitlab_task.rb lib/system_check/rake_task/gitlab_task.rb +0 -3

No files found.
--- a/lib/system_check/rake_task/app_task.rb
+++ b/lib/system_check/rake_task/app_task.rb
@@ -36,8 +36,5 @@ module SystemCheck
    end
  end
 end
-<<<<<<< HEAD

 SystemCheck::RakeTask::AppTask.prepend(EE::SystemCheck::RakeTask::AppTask)
-=======
->>>>>>> upstream/master
--- a/lib/system_check/rake_task/gitlab_task.rb
+++ b/lib/system_check/rake_task/gitlab_task.rb
@@ -31,8 +31,5 @@ module SystemCheck
    end
  end
 end
-<<<<<<< HEAD

 SystemCheck::RakeTask::GitlabTask.prepend(EE::SystemCheck::RakeTask::GitlabTask)
-=======
->>>>>>> upstream/master