Resolve project_hook.rb

1d2021ea · Luke Bennett · d1085ef8 · 1d2021ea
Commit 1d2021ea authored Jan 18, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

app/models/hooks/project_hook.rb app/models/hooks/project_hook.rb +0 -5

No files found.
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
 class ProjectHook < WebHook
-<<<<<<< HEAD
  include CustomModelNaming
  include TriggerableHooks

  self.singular_route_key = :hook

-=======
-  include TriggerableHooks
-
->>>>>>> upstream/master
  triggerable_hooks [
    :push_hooks,
    :tag_push_hooks,