diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-02-05 08:57:06 -0600 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-02-05 08:57:06 -0600 |
| commit | 3cdaaf0996595f4f44727d070f679efe60fe3e6d (patch) | |
| tree | 84d5d823eb904738bcbb4a534daf967c0d1dbd39 | |
| parent | bf0895893d1394af6869f62bf27fb2541553948b (diff) | |
| download | gitlab-ce-3cdaaf0996595f4f44727d070f679efe60fe3e6d.tar.gz | |
Resolve conflict in email_pipeline.rb
| -rw-r--r-- | lib/banzai/pipeline/email_pipeline.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/banzai/pipeline/email_pipeline.rb b/lib/banzai/pipeline/email_pipeline.rb index 7c959fe17e1..13e6a990407 100644 --- a/lib/banzai/pipeline/email_pipeline.rb +++ b/lib/banzai/pipeline/email_pipeline.rb @@ -12,12 +12,8 @@ module Banzai def self.transform_context(context) super(context).merge( only_path: false, -<<<<<<< HEAD emailable_links: true, no_sourcepos: true -======= - emailable_links: true ->>>>>>> dev/master ) end end |