Commit 3cdaaf09 authored by Brett Walker's avatar Brett Walker
Browse files

Resolve conflict in email_pipeline.rb

parent bf089589
......@@ -12,12 +12,8 @@ def self.filters
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment